diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 26480cc53a..8a97473edc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -35,13 +35,6 @@
                 [% END %]
             </div> <!-- /.col-sm-2 -->
             <div class="col-sm-9">
-                [% IF adminWarning %]
-                    <div id="adminwarning" class="dialog alert">
-                        <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
-                        <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
-                        <p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p>
-                    </div>
-                [% END %]
                 <div class="row">
                     <div class="col-xs-6">
                         <ul class="biglinks-list">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 9ce4add254..6604cb65ea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -39,17 +39,6 @@
             <div class="span10">
                 <div id="userdetails" class="maincontent">
 
-                    [% IF adminWarning %]
-                        <div id="adminwarning" class="dialog alert">
-                            <p>
-<strong><i class="fa fa-exclamation-triangle"> </i> Warning:</strong>
-Using this account is not recommended because some parts of Koha will not function as expected. Instead, please log in with a different account.
-<a class="btn btn-small" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
-<i class="fa fa-sign-out"> </i> Log out</a>
-                            </p>
-                        </div>
-                    [% END %]
-
                     [% INCLUDE 'opac-note.inc' %]
 
                     <h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]
diff --git a/mainpage.pl b/mainpage.pl
index 47f56ad27f..da6aaee924 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -84,11 +84,4 @@ $template->param(
     pending_article_requests       => $pending_article_requests,
 );
 
-#
-# warn user if they are using mysql/admin login
-#
-unless ($loggedinuser) {
-    $template->param(adminWarning => 1);
-}
-
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index ab3d8a786f..3400f39d42 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -88,10 +88,6 @@ my $canrenew = 1;
 
 $template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') );
 
-if (!$borrowernumber) {
-    $template->param( adminWarning => 1 );
-}
-
 # get borrower information ....
 my $patron = Koha::Patrons->find( $borrowernumber );
 my $borr = $patron->unblessed;