diff --git a/admin/share_content.pl b/admin/share_content.pl
index 475771aad8..2b9bd855e8 100755
--- a/admin/share_content.pl
+++ b/admin/share_content.pl
@@ -58,12 +58,10 @@ if ( $op eq 'reset' ) {
 }
 
 if ( $op eq 'send' ) {
-    my $name = $query->param('lastname');
-    my $firstname = $query->param('firstname');
+    my $name = $query->param('name');
     my $email = $query->param('email');
 
-    my $content = to_json({firstname => $firstname,
-                           lastname => $name,
+    my $content = to_json({name => $name,
                            email => $email});
 
     my $mana_ip = C4::Context->config('mana_config');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index 11d4e6c196..601b2a32d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -91,7 +91,7 @@
                 [% UNLESS Koha.Preference('ManaToken') %]
                     <h3>Configure Mana KB</h3>
 
-                    <p>Once you have enabled Mana it must be configured. Type your first name, last name, and email address and submit. This will send a account creation request to Mana KB that will respond back with a Mana KB token (an encrypted ID that uniquely identifies your Koha installation). This token will automatically be saved in your database. After that you will receive an email. Read it and follow the instructions.</p>
+                    <p>Once you have enabled Mana it must be configured. Type your name, and email address and submit. This will send a account creation request to Mana KB that will respond back with a Mana KB token (an encrypted ID that uniquely identifies your Koha installation). This token will automatically be saved in your database. After that you will receive an email. Read it and follow the instructions.</p>
                 [% END %]
 
                 [% IF Koha.Preference('ManaToken') %]
@@ -116,12 +116,9 @@
                         <fieldset class="rows" id="mana_subscription">
                             <ol>
                                 <li>
-                                    <label for="firstname">First name: </label>
-                                    <input id="firstname" type="text" name="firstname" />
-                                </li>
-                                <li>
-                                    <label for="lastname">Last name: </label>
-                                    <input id="lastname" type="text" name="lastname" />
+                                    <label for="name">Your name: </label>
+                                    <input id="name" type="text" name="name" />
+                                    <div class="hint">Enter a personal or organization name.</div>
                                 </li>
                                 <li>
                                     <label for="email">Email: </label>