Kevin's Partial Login Fix