Fix #93
Merge pull request #234 from ZeusWPI/feature/94/redirect-to-current-page-after-login

Fix #93