Refactor both password forms for code reuse

1 job for !177 with 289-change-password in 3 minutes and 43 seconds (queued for 10 seconds)
latest merge request