Forgot pass fixes