diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco
index ec7cf28e7..1055754c4 100644
--- a/app/assets/javascripts/app/views/agent_user_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco
@@ -1,13 +1,13 @@
-<div class="modal-header">
-  <a href="#" class="close">&times;</a>
-  <h3><%= @head %></h3>
-</div>
-<div class="modal-body">
 <form class="form-horizontal">
-  <%- @form %>
-</form>
-</div>
-<div class="modal-footer">
-  <button class="btn btn-primary submit">Submit</button>
-  <button class="btn secondary cancel">Cancel</button>
-</div>
+  <div class="modal-header">
+    <a href="#" class="close">&times;</a>
+    <h3><%= @head %></h3>
+  </div>
+  <div class="modal-body">
+    <%- @form %>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary submit">Submit</button>
+    <button class="btn secondary cancel">Cancel</button>
+  </div>
+</form>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/admin/edit.jst.eco b/app/assets/javascripts/app/views/generic/admin/edit.jst.eco
index 62d8024be..d6bf2490a 100644
--- a/app/assets/javascripts/app/views/generic/admin/edit.jst.eco
+++ b/app/assets/javascripts/app/views/generic/admin/edit.jst.eco
@@ -1,13 +1,13 @@
-<div class="modal-header">
-  <a href="#" class="close">&times;</a>
-  <h3><%= @head %></h3>
-</div>
-<div class="modal-body">
 <form class="form-horizontal">
-  <%- @form %>
+  <div class="modal-header">
+    <a href="#" class="close">&times;</a>
+    <h3><%= @head %></h3>
+  </div>
+  <div class="modal-body">
+    <%- @form %>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary submit">Submit</button>
+    <button class="btn cancel">Cancel</button>
+  </div>
 </form>
-</div>
-<div class="modal-footer">
-  <button class="btn btn-primary submit">Submit</button>
-  <button class="btn cancel">Cancel</button>
-</div>
diff --git a/app/assets/javascripts/app/views/generic/admin/new.jst.eco b/app/assets/javascripts/app/views/generic/admin/new.jst.eco
index 5c28f8993..d6bf2490a 100644
--- a/app/assets/javascripts/app/views/generic/admin/new.jst.eco
+++ b/app/assets/javascripts/app/views/generic/admin/new.jst.eco
@@ -1,13 +1,13 @@
-<div class="modal-header">
-  <a href="#" class="close">&times;</a>
-  <h3><%= @head %></h3>
-</div>
-<div class="modal-body">
 <form class="form-horizontal">
-  <%- @form %>
+  <div class="modal-header">
+    <a href="#" class="close">&times;</a>
+    <h3><%= @head %></h3>
+  </div>
+  <div class="modal-body">
+    <%- @form %>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary submit">Submit</button>
+    <button class="btn cancel">Cancel</button>
+  </div>
 </form>
-</div>
-<div class="modal-footer">
-  <button class="btn btn-primary submit">Submit</button>
-  <button class="btn  cancel">Cancel</button>
-</div>
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index ce7cee58e..39cd69db8 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -12,7 +12,14 @@ body {
 [class*=" icon-"] {
   background-image: url("../assets/glyphicons-halflings.png");
 }
-  
+
+/*
+ * removed margin of forms to not break the layout with submit buttons within <form></form> area e. g. for modal dialogs
+ */
+form {
+  margin: 0 0 0 0;
+}
+
 .edit {
   min-height:30px;
 }