Fix for user active only
System bug fixed
Merge pull request #677 from sexnothing/user

System bug fixed
Merge remote-tracking branch 'upstream/user' into user
Fix redirect