Fix login functionality
Merge remote-tracking branch 'origin/Audun'
Fix login functionality