fix problems with "current_user" correctly"