diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__get__Current_User.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__get__Current_User.yaml
index fca1e41..38ca893 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__get__Current_User.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__get__Current_User.yaml
@@ -12,6 +12,7 @@
     forClassId: '&IDC_User;'
     verb: 'get'
     name: 'Currently Logged-in User'
+    static: yes
     accessModifierId: '&IDI_AccessModifier_RootA2;'
     systemInstanceSetRoutineId: '&IDI_SystemInstanceSetRoutine_GetCurrentUser;'
     returnsWorkSetId: '&IDI_WorkSet_UserSingular;'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__is__Logged_In.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__is__Logged_In.yaml
index d439dcc..20eb9fe 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__is__Logged_In.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/User/System_User__is__Logged_In.yaml
@@ -8,6 +8,7 @@
     forClassId: '&IDC_User;'
     verb: 'is'
     name: 'Logged In'
+    static: yes
     accessModifierId: '&IDI_AccessModifier_RootA2;'
     returnsAttributeId: '&IDA_UserIsLoggedIn;'
     source: '&IDMB_User__get__Current_User;'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
index 4368dcc..e4786fb 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
@@ -61,6 +61,7 @@
       forClassId: '&IDC_User;'
       verb: 'update'
       name: 'User Login and Session Credentials'
+      static: yes
       systemUpdateRoutineId: '&IDI_SystemUpdateRoutine_LoginUser;'
       # comment: 'Calls into the OMS system update routine to save user login details. The resulting login token can be accessed with `OMS@get User Login Token(GAS)*S(public)`.'