updated log in and user manager
Merge pull request #116 from jkuk/master

updated log in and user manager