Login and Register stuff
Merge fix