Preventing duplicate logins
merge commit