diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html
index 4838e99..0646437 100644
--- a/devapp/templates/devapp/add_dev.html
+++ b/devapp/templates/devapp/add_dev.html
@@ -41,12 +41,12 @@
                         {% if already_dev %}
                             <span class="input-group-btn">
                                 <a class="btn btn-danger" href="{% url 'devapp:view' group.pk already_dev.pk %}" title="{% trans 'View the device' %}" data-toggle="tooltip">
-                                    {% for err in form.mac_addr.errors %}{{ err }}{% endfor %}
                                     {{ already_dev.comment }}
                                 </a>
                             </span>
                         {% endif %}
                     </div>
+		    {{ form.mac_addr.errors }}
                 </div>
 
                 <div class="form-group">
diff --git a/devapp/views.py b/devapp/views.py
index f8faf8b..46bab38 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -118,7 +118,9 @@ def dev(request, grp, devid=0):
         return render(request, 'devapp/dev.html', {
             'form': frm,
             'dev': devinst,
-            'selected_parent_dev': devinst.parent_dev or None
+            'selected_parent_dev': devinst.parent_dev or None,
+            'group': user_group,
+            'already_dev': already_dev
         })