diff --git a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
index d0a2d2b1..23873b15 100644
--- a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
+++ b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
@@ -183,7 +183,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     [super setActiveUser:activeUser];
 
-    [MPMacConfig get].usedUserName = activeUser.name;
+    if (activeUser)
+        [MPMacConfig get].usedUserName = activeUser.name;
 
     PearlMainQueue( ^{
         [self updateUsers];