Fikset innlogging.
Merge origin/master