login-plan form improved