Minor template tweaks
Fix password confirm – Addendum to 42d1e63e4