diff --git a/code/editor/EditableFileField.php b/code/editor/EditableFileField.php
index b16290d..76142c1 100755
--- a/code/editor/EditableFileField.php
+++ b/code/editor/EditableFileField.php
@@ -27,15 +27,8 @@ class EditableFileField extends EditableFormField {
 	
 	static $plural_names = 'File fields';
 	
-	function getFormField() {
-		if($field = parent::getFormField()) {
-			return $field;
-		}
-		return new FileField($this->Name, $this->Title, $this->getField('Default'));
-	}
-	
-	function getSimpleFormField(){
-		return new FileField($this->Name, $this->Title, $this->getField('Default'));
+	public function getFormField() {
+		return new FileField($this->Name, $this->Title);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/code/editor/EditableMemberListField.php b/code/editor/EditableMemberListField.php
index 653bec7..c2140f9 100644
--- a/code/editor/EditableMemberListField.php
+++ b/code/editor/EditableMemberListField.php
@@ -6,36 +6,26 @@
  */
 class EditableMemberListField extends EditableFormField {
 	
-	static $has_one = array(
-		'Group' => 'Group'
-	);
-	
 	static $singular_name = 'Member list field';
+	
 	static $plural_name = 'Member list fields';
 	
 	public function DefaultField() {
-		// return new TreeDropdownField( "Fields[{$this->ID}][GroupID]", 'Group' );
 		
 		$groups = DataObject::get('Group');
 		
 		foreach( $groups as $group )
 			$groupArray[$group->ID] = $group->Title;
 		
-		return new DropdownField( "Fields[{$this->ID}][GroupID]", 'Group', $groupArray, $this->GroupID );
-	}
-	
-	public function populateFromPostData( $data ) {
-		$this->GroupID = $data['GroupID'];
-		
-		parent::populateFromPostData( $data );
+		return new DropdownField( "Fields[{$this->ID}][CustomSetting][GroupID]", 'Group', $groupArray, $this->getSetting('GroupID'));
 	}
 	
 	function getFormField() {
-		return new DropdownField( $this->Name, $this->Title, Member::mapInGroups( $this->GroupID ) );
+		return new DropdownField( $this->Name, $this->Title, Member::mapInGroups($this->getSetting($this->GroupID)));
 	}
 	
-	function getValueFromData( $data ) {
-		$value = $data[$this->Name];
+	function getValueFromData($data) {
+		$value = Convert::raw2sql($data[$this->Name]);
 		
 		$member = DataObject::get_one('Member', "Member.ID = {$value}");
 		return $member->getName();