Merge pull request #5 from pembemiriam/master

Fixed bugs on login and dashboard page