added password reset and cleaned up user forms