Fixed login button
Merge remote-tracking branch 'origin/user' into user