added most recent commit from login-modal