Fixed bugs in current_user
Minor polish