diff --git a/C4/Letters.pm b/C4/Letters.pm
index a25aaf2a6f..737c8cd015 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -314,21 +314,20 @@ sub delalert {
 sub getalert {
     my ( $borrowernumber, $type, $externalid ) = @_;
     my $dbh   = C4::Context->dbh;
-    my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE";
+    my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE 1";
     my @bind;
     if ($borrowernumber and $borrowernumber =~ /^\d+$/) {
-        $query .= " borrowernumber=? AND ";
+        $query .= " AND borrowernumber=?";
         push @bind, $borrowernumber;
     }
     if ($type) {
-        $query .= " type=? AND ";
+        $query .= " AND type=?";
         push @bind, $type;
     }
     if ($externalid) {
-        $query .= " externalid=? AND ";
+        $query .= " AND externalid=?";
         push @bind, $externalid;
     }
-    $query =~ s/ AND $//;
     my $sth = $dbh->prepare($query);
     $sth->execute(@bind);
     return $sth->fetchall_arrayref({});
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 675bc33376..af025085c4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -27,6 +27,18 @@
             </div>
             <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 %]
+
                     [% IF ( bor_messages ) %]
                         <div class="alert alert-info">
                             <h3>Messages for you</h3>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 413c26dbfe..a23a032aca 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -80,6 +80,10 @@ my $canrenew = 1;
 
 $template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') );
 
+if (!$borrowernumber) {
+    $template->param( adminWarning => 1 );
+}
+
 # get borrower information ....
 my ( $borr ) = GetMemberDetails( $borrowernumber );