Change some things around.
Fix things for user to log in properly