diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index fa9ed0bf5d..a699918530 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -989,13 +989,8 @@
         [% END %]
         [% UNLESS nobranchcode %]
     <li>
-      [%- IF ( mandatorybranchcode ) -%]
-        <label for="branchcode" class="required">
-      [%- ELSE -%]
-        <label for="branchcode">
-      [%- END -%]
-      Library:</label>
-      <select name="branchcode" size="1" id="branchcode">
+        <label for="branchcode" class="required">Library:</label>
+        <select name="branchcode" size="1" id="branchcode">
         [%- FOREACH branchloo IN branchloop %]
           [% IF ( branchloo.selected ) -%]
             <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
@@ -1004,13 +999,11 @@
           [%- END -%]
         [%- END %]
       </select>
-      [% IF ( mandatorybranchcode ) -%]
       <span class="required">Required</span>
-      [%- END %]
     </li>
         [% END %]
     <li>
-        <label for="categorycode">Category: </label>
+        <label for="categorycode" class="required">Category: </label>
         <select id="categorycode" name="categorycode" onchange="update_category_code(this);">
         [% FOREACH typeloo IN typeloop %]
             [% FOREACH categoryloo IN typeloo.categoryloop %]
@@ -1033,6 +1026,7 @@
             [% END %]
        [% END %]
        </select>
+       <span class="required">Required</span>
     </li>
         [% UNLESS nosort1 %]
     <li>