Fixed up the login user creating logic