diff --git a/include/class.forms.php b/include/class.forms.php
index 161e06fdb24ec34f700b025b55adff01f80f4c78..cc6572a3efdac509067b256d34f5a5df7a35de8f 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2690,15 +2690,12 @@ class DepartmentField extends ChoiceField {
           else {
             $current_id = $selected->value;
             $current_name = Dept::getNameById($current_id);
-            $addNew = true;
           }
         }
 
-        $active_depts = array();
-        if($current_id)
-          $active_depts = Dept::objects()
-            ->filter(array('flags__hasbit' => Dept::FLAG_ACTIVE))
-            ->values('id', 'name');
+        $active_depts = Dept::objects()
+          ->filter(array('flags__hasbit' => Dept::FLAG_ACTIVE))
+          ->values('id', 'name');
 
         $choices = array();
         if ($depts = Dept::getDepartments(null, true, Dept::DISPLAY_DISABLED)) {
@@ -2708,18 +2705,17 @@ class DepartmentField extends ChoiceField {
             $active[$dept['id']] = $dept['name'];
 
           //add selected dept to list
-          $active[$current_id] = $current_name;
-
+          if($current_id)
+            $active[$current_id] = $current_name;
+          else
+            return $active;
 
           foreach ($depts as $id => $name) {
             $choices[$id] = $name;
             if(!array_key_exists($id, $active) && $current_id)
-              unset($choices[$id]);
+                unset($choices[$id]);
           }
-
         }
-        if($addNew)
-          $choices[':new:'] = '— '.__('Add New').' —';
 
         return $choices;
     }
@@ -3933,6 +3929,8 @@ class ChoicesWidget extends Widget {
                         $values[$v] = $choices[$v];
                     elseif (($i=$this->field->lookupChoice($v)))
                         $values += $i;
+                    elseif (!$k && $v)
+                      return $v;
                 }
             }
         }
@@ -4916,7 +4914,7 @@ class ReferralForm extends Form {
                               ),
                             )
                 ),
-            'dept' => new ChoiceField(array(
+            'dept' => new DepartmentField(array(
                     'id'=>4,
                     'label' => '',
                     'flags' => hexdec(0X450F3),