diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index 6b8c70f..78279f9 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -133,7 +133,7 @@ class UserDefinedForm extends Page
             // text to show on complete
             $onCompleteFieldSet = new CompositeField(
                 $label = new LabelField('OnCompleteMessageLabel', _t('UserDefinedForm.ONCOMPLETELABEL', 'Show on completion')),
-                $editor = new HtmlEditorField('OnCompleteMessage', '', _t('UserDefinedForm.ONCOMPLETEMESSAGE', $self->OnCompleteMessage))
+                $editor = new HtmlEditorField('OnCompleteMessage', '', $self->OnCompleteMessage)
             );
 
             $onCompleteFieldSet->addExtraClass('field');
diff --git a/code/model/editableformfields/EditableMemberListField.php b/code/model/editableformfields/EditableMemberListField.php
index 310e543..7d4ce2f 100644
--- a/code/model/editableformfields/EditableMemberListField.php
+++ b/code/model/editableformfields/EditableMemberListField.php
@@ -45,8 +45,13 @@ class EditableMemberListField extends EditableFormField
         }
 
         $members = Member::map_in_groups($this->GroupID);
-        $field = new DropdownField($this->Name, $this->EscapedTitle, $members);
+
+        $field = DropdownField::create($this->Name, $this->EscapedTitle, $members)
+            ->setTemplate('UserFormsDropdownField')
+            ->setFieldHolderTemplate('UserFormsField_holder');
+
         $this->doUpdateFormField($field);
+
         return $field;
     }