Login tested on local and server and solved looping issues
Merge