Uploaded user login
Merge and fix