Allow strings/symbols in current_user, remove unneeded user_data