able to log in, but database fails
fixed user login, works perfectly now
make sure this works
merged all changes