Login changes
Merged