Changed current_user to main_current_user to avoid conflicts

Changed current_user to main_current_user to avoid conflicts