Fixed and working...
Merge origin/master
Working but can't log in/out.
All still working.