message if login failed, redirect fixes
Merge branch 'robin' into develop