changed login stuff
merge