diff --git a/C4/Auth.pm b/C4/Auth.pm
index f82a0629e1..9b3e89390f 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1051,7 +1051,7 @@ sub checkauth {
                         $branchname = $library? $library->branchname: '';
                     }
                     my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
-                    if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
+                    if ( C4::Context->boolean_preference('AutoLocation') ) {
 
                         # we have to check they are coming from the right ip range
                         my $domain = $branches->{$branchcode}->{'branchip'};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 82743dddfe..79b5d15db7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -54,17 +54,17 @@
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
 </p>
 
-[% IF ( AutoLocation ) %][% ELSE %]
-[% IF ( IndependentBranches ) %][% ELSE %]
-<p><label for="branch">Library:</label>
-    <select name="branch" id="branch" class="input" tabindex="3">
-    <option value="">My library</option>
-    [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
-        <option value="[% l.branchcode %]">[% l.branchname %]</option>
-    [% END %]
-    </select>
-    </p>[% END %]
-	[% END %]
+[% UNLESS IndependentBranches %]
+    <p>
+        <label for="branch">Library:</label>
+        <select name="branch" id="branch" class="input" tabindex="3">
+            <option value="">My library</option>
+            [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
+                <option value="[% l.branchcode %]">[% l.branchname %]</option>
+            [% END %]
+        </select>
+    </p>
+[% END %]
 
 <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index 48f4f8d43b..e2a129cf92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -24,7 +24,7 @@
     [% IF ( display_transfer ) %]
 		<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
     [% END %]
-    [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %][% END %]
+    [% UNLESS IndependentBranches %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %]
 	[% IF ( fast_cataloging ) %]
 	    [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
 		<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>