Fixed crash on login
hej
Merge branch 'master' into test
Fixed minor buggs
nothing changed
push