Added reset password functionality, cleaned up other forms