diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index cdb6f640..23423955 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -231,8 +231,8 @@ class ManagerImpl implements Manager {
         if (deviceName != null) {
             context.getAccountHelper().setDeviceName(deviceName);
         }
-        context.getAccountHelper().checkWhoAmiI();
         context.getAccountHelper().updateAccountAttributes();
+        context.getAccountHelper().checkWhoAmiI();
     }
 
     @Override