Merge Password form and more #215