Merge: rev803 (Fix UnboundLocalError in forgot password view)