Fixed non login issue and added redirection to login
Merge branch 'require'