Changed logged_in_user to current user