Switched to separate login process