real current_user
Merge branch 'hotfix/real_current_user'