Fixed hang on login