Fix login and signup errors.
Merge files.