Login-button goes back to current page after login
Merge branch 'master' into demo