fixed login issue when a user is signing in or signing up
Merge remote-tracking branch 'origin/userdashboard_login' into userdashboard