updating login flow and sockets
merge conflicts