diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 0a589a9de..923561a41 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -375,8 +375,8 @@
                 text-align: right;
                 button {
                     margin: 0px !important;
-                    &:not(:last-child) {
-                        margin-right: @alertify_padding-base !important;
+                    &:not(:first-child) {
+                        margin-left: @alertify_padding-base !important;
                       }
                 }
             }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 366931b24..a8f47c372 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1718,7 +1718,8 @@ define([
             NThen(function (waitFor) {
                 $(linkForm).hide();
                 $(linkSpin).show();
-                $nav.find('button.cp-teams-invite-create').prop('disabled', 'disabled');
+                $nav.find('button.cp-teams-invite-create').hide();
+                $nav.find('button.cp-teams-invite-copy').show()
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
                 InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (_bytes) {
@@ -1738,7 +1739,7 @@ define([
                     if (obj && obj.error) {
                         waitFor.abort();
                         $(linkSpin).hide();
-                        return void $(linkError).text('ERROR '+obj.error).show(); // XXX
+                        return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
                     }
                     // Display result here
                     $(linkSpin).hide();
@@ -1774,7 +1775,7 @@ define([
         var frameLink = UI.dialog.customModal(linkContent, {
             buttons: linkButtons,
         });
-        $(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled');
+        $(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled').hide();
 
         // Create modal
         var tabs = [{