Reset password restructurings