added user account creation on login
fix merge
fix merge