Add extra old password field and link other fields correctly