diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3be250cc8..292219851 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -377,7 +377,7 @@ define([
         var $block = UIElements.createDropdown(dropdownConfig);
         $block.setValue('VIEWER');
 Messages.team_inviteRole = "Initial role"; // XXX
-Messages.team_inviteUses = "Max uses (0 = infinite)"; // XXX
+Messages.team_inviteUses = "Use(s) allowed for this link (0 = no limit)"; // XXX
 
 
 
@@ -418,13 +418,13 @@ Messages.team_inviteUses = "Max uses (0 = infinite)"; // XXX
                     $block[0]
                 ),
                 h('div.cp-teams-invite-block.cp-teams-invite-uses',
-                    h('span', Messages.team_inviteUses),
                     linkUses = h('input', {
                         type: 'number',
                         min: 0,
                         max: 999,
                         value: 1
-                    })
+                    }),
+                    h('span', Messages.team_inviteUses)
                 ),
             ]),
             linkSpin = h('div.cp-teams-invite-spinner', {
diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index ed5fcff4a..54567f66f 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -287,13 +287,14 @@
 
     .cp-teams-invite-uses { // XXX
         input {
-            margin-left: 10px !important;
             margin-bottom: 0px !important;
+            margin-right: 10px;
             width: 75px !important;
         }
 
     }
     .cp-teams-invite-role {
+        margin-bottom: 15px;
         span:first-child {
             margin-right: 10px;
         }
diff --git a/www/teams/inner.js b/www/teams/inner.js
index ae3809aae..c8c5d443a 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -717,10 +717,10 @@ define([
             }, ' ' + Messages.team_pendingOwner));
         }
         if (data.pending && data.inviteChannel && data.remaining === -1) { // Invite link
-            Messages.team_linkUsesInfinite = "(infinite uses)"; // XXX
+            Messages.team_linkUsesInfinite = "(infinite uses)"; // XXX DB done
             $(name).append(h('em', ' ' + Messages.team_linkUsesInfinite));
         } else if (data.pending && data.inviteChannel) {
-            Messages.team_linkUses = "({0}/{1} remaining)"; // XXX
+            Messages.team_linkUses = "({0}/{1} remaining)"; // XXX DB done
             $(name).append(h('em', ' ' + Messages._getKey('team_linkUses', [
                 data.remaining || 1,
                 data.totalUses || 1