diff --git a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java
index a142fc34..260901b7 100644
--- a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java
+++ b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java
@@ -53,6 +53,9 @@ public Login(
 
     @WorkerThread
     public void execute(@NonNull String username, @NonNull String password) throws Exception {
+        if (Global.getGlobal().getOfficerCode() == null) {
+            Global.getGlobal().setOfficerCode(username);
+        }
         String officerCode = Global.getGlobal().getOfficerCode();
         if (officerCode == null) {
             throw new IllegalStateException("OfficerCode should not be null on login");