Revert "log in clean up"

This reverts commit 7e93b47b7c5763ce809a467be3f598c73fe78ed2.
Revert "fix bug with user name"

This reverts commit 26f9bd3feb514881fd2871883f551362daa60821.