login redone

af Jun & Jonas
Merge origin/master