fixed some login probs
Revert "fixed some login probs"

This reverts commit 9852897d361747b899bf131582f788403c003a47.
Merge origin/master
fixed some login probs+added stuff