diff --git a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
index 0f55e2fd3..d24f1fbdf 100644
--- a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
+++ b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
@@ -9,11 +9,13 @@
   <p><%- @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
 
   <h3><label for="calendar-subscription-url"><%- @T('URL') %></label></h3>
-  <div class="form-group">
-    <div class="controls">
-      <input type="url" class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets" id="calendar-subscription-url">
+  <form class="form--flexibleWidth">
+    <div class="form-group">
+      <div class="controls">
+        <input type="url" class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets" id="calendar-subscription-url">
+      </div>
     </div>
-  </div>
+  </form>
 
   <h3><%- @T('Subscription Settings') %></h3>
   <table class="settings-list">
diff --git a/app/assets/javascripts/app/views/profile/notification.jst.eco b/app/assets/javascripts/app/views/profile/notification.jst.eco
index baf6f7b98..c887b8636 100644
--- a/app/assets/javascripts/app/views/profile/notification.jst.eco
+++ b/app/assets/javascripts/app/views/profile/notification.jst.eco
@@ -2,7 +2,7 @@
   <div class="page-header-title"><h1><%- @T( 'Notifications' ) %></h1></div>
 </div>
 
-<form div class="page-content">
+<form class="page-content form--flexibleWidth">
 
   <div class="settings-entry">
     <table class="settings-list">
diff --git a/app/assets/javascripts/app/views/profile/password.jst.eco b/app/assets/javascripts/app/views/profile/password.jst.eco
index 57265fc07..7d5453354 100644
--- a/app/assets/javascripts/app/views/profile/password.jst.eco
+++ b/app/assets/javascripts/app/views/profile/password.jst.eco
@@ -4,7 +4,7 @@
   </div>
 </div>
 <div class="page-content">
-  <form class="settings-entry">
+  <form class="settings-entry form--flexibleWidth">
     <div class="password_item"></div>
     <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
   </form>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index ce6c0def3..920a171d8 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2515,6 +2515,10 @@ ol.tabs li {
  */
 form {
   margin: 0;
+  
+  &.form--flexibleWidth .controls {
+    display: table;
+  }
 }
 
 .form-controls {