diff --git a/Netdisco/Changes b/Netdisco/Changes
index 247f6e26..81a8d1cd 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -7,6 +7,7 @@
   [ENHANCEMENTS]
 
   * Display "Auto" when there is no discovered duplex setting
+  * Add suggest_guest option to display login banner offering Guest acct
 
 2.012006 - 2013-08-23
 
diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
index 88c5c1f7..b36d7cbd 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
@@ -95,6 +95,13 @@ database:
  netdisco=> update users set port_control = true where username = 'guest';
  netdisco=> update users set admin = true where username = 'guest';
 
+=head3 C<suggest_guest>
+
+Value: Boolean. Default: C<false>.
+
+Enable this to display a banner suggesting to log in with a guest account.
+The username and password of this account must both be "guest".
+
 =head3 C<trust_remote_user>
 
 Value: Boolean. Default: C<false>.
diff --git a/Netdisco/share/views/index.tt b/Netdisco/share/views/index.tt
index 5e3c7a0a..538de26c 100644
--- a/Netdisco/share/views/index.tt
+++ b/Netdisco/share/views/index.tt
@@ -26,6 +26,12 @@
           <a href="http://sourceforge.net/p/netdisco/bugs/" target="_blank"><i class="icon-bug"></i>&nbsp;Report a Bug?</a>
       </div>
       [% END %]
+      [% IF settings.suggest_guest AND NOT session.logged_in_user %]
+      <div class="alert alert-info fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Guest access is available by entering username &quot;guest&quot; and password &quot;guest&quot;.
+      </div>
+      [% END %]
       <div class="hero-unit">
         <h2>Welcome to Netdisco</h2>
         <small>Netdisco is an Open Source web-based network management tool.</small>