diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html
+++ b/kallithea/templates/admin/my_account/my_account_api_keys.html
@@ -57,9 +57,17 @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
-                <label class="control-label" for="description">${_('New API key')}:</label>
-                <div class="form-inline">
+                <label class="control-label">${_('New API key')}</label>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="description">${_('Description')}:</label>
+                <div>
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="lifetime">${_('Lifetime')}:</label>
+                <div>
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html
--- a/kallithea/templates/admin/users/user_edit_api_keys.html
+++ b/kallithea/templates/admin/users/user_edit_api_keys.html
@@ -57,13 +57,20 @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
-                <label class="control-label" for="description">${_('New API key')}:</label>
-                <div class="form-inline">
+                <label class="control-label">${_('New API key')}</label>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="description">${_('Description')}:</label>
+                <div>
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="lifetime">${_('Lifetime')}:</label>
+                <div>
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
-
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}