Added a password form element and a label wrapper element