diff --git a/src/Controller/EmergencyTypeController.php b/src/Controller/EmergencyTypeController.php
index 228351fd..08efee2b 100644
--- a/src/Controller/EmergencyTypeController.php
+++ b/src/Controller/EmergencyTypeController.php
@@ -238,7 +238,8 @@ class EmergencyTypeController extends Controller
     protected function setObject(EmergencyType $obj, Request $req)
     {
         // set and save values
-        $obj->setName($req->request->get('name'));
+        $obj->setName($req->request->get('name'))
+            ->setCode($req->request->get('code'));
     }
 
     protected function setQueryFilters($datatable, QueryBuilder $query)
diff --git a/src/Entity/EmergencyType.php b/src/Entity/EmergencyType.php
index b08acddd..de02a503 100644
--- a/src/Entity/EmergencyType.php
+++ b/src/Entity/EmergencyType.php
@@ -8,7 +8,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="emergency_type")
+ * @ORM\Table(name="emergency_type", indexes={
+ *     @ORM\Index(name="emergency_type_idx", columns={"code"}),
  * })
  */
 class EmergencyType
@@ -27,6 +28,12 @@ class EmergencyType
      */
     protected $name;
 
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $code;
+
     public function getID()
     {
         return $this->id;
@@ -43,4 +50,15 @@ class EmergencyType
         return $this->name;
     }
 
+    public function setCode($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    public function getCode()
+    {
+        return $this->code;
+    }
+
 }
diff --git a/templates/emergency-type/form.html.twig b/templates/emergency-type/form.html.twig
index 910909d3..a3f9aad7 100644
--- a/templates/emergency-type/form.html.twig
+++ b/templates/emergency-type/form.html.twig
@@ -34,7 +34,7 @@
                 </div>
                 <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('emergency_type_update_submit', {'id': emergency_type.getId()}) : url('emergency_type_add_submit') }}">
                     <div class="m-portlet__body">
-                        <div class="form-group m-form__group row">
+                        <div class="form-group m-form__group row no-border">
                             <label class="col-lg-3 col-form-label" data-field="name">
                                 Name:
                             </label>
@@ -43,6 +43,15 @@
                                 <div class="form-control-feedback hide" data-field="name"></div>
                             </div>
                         </div>
+                        <div class="form-group m-form__group row">
+                            <label class="col-lg-3 col-form-label" data-field="code">
+                                Code:
+                            </label>
+                            <div class="col-lg-9">
+                                <input type="text" name="code" class="form-control m-input" value="{{ emergency_type.getCode() }}">
+                                <div class="form-control-feedback hide" data-field="code"></div>
+                            </div>
+                        </div>
                     </div>
                     <div class="m-portlet__foot m-portlet__foot--fit">
                         <div class="m-form__actions m-form__actions--solid m-form__actions--right">