diff --git a/database/packages/app.sql b/database/packages/app.sql
index 52bd79a..214798d 100644
--- a/database/packages/app.sql
+++ b/database/packages/app.sql
@@ -142,7 +142,10 @@ CREATE OR REPLACE PACKAGE BODY app AS
     AS
     BEGIN
         RETURN COALESCE (
-            APEX_APPLICATION.G_USER,
+            CASE WHEN INSTR(APEX_APPLICATION.G_USER, '@') > 0
+                THEN LOWER(APEX_APPLICATION.G_USER)
+                ELSE APEX_APPLICATION.G_USER
+                END,
             SYS_CONTEXT('USERENV', 'SESSION_USER'),
             USER
         );