diff --git a/VERSION b/VERSION
index 219dd5ab..497bbb0c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.01.07.54.28
+Version 2.6.0-development+timestamp.2013.09.01.08.06.40
diff --git a/gluon/tools.py b/gluon/tools.py
index 11f02c5e..53508bf1 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1304,8 +1304,9 @@ class Auth(object):
         else:
             raise HTTP(404)
 
-    def navbar(self, mode='Default', action=None, prefix='Welcome',
-               referrer_actions=DEFAULT, user_identifier=DEFAULT):
+    def navbar(self, prefix='Welcome', action=None,
+               separators=(' [ ', ' | ', ' ] '), user_identifier=DEFAULT,
+               referrer_actions=DEFAULT, mode='default'):
         """ Navbar with support for more templates
         This uses some code from the old navbar.
 
@@ -1490,21 +1491,21 @@ class Auth(object):
                    'bare': bare
                    }  # Define custom modes.
 
-        try:
+        if mode in options and callable(options[mode]):
             options[mode]()
-        except KeyError:  # KeyError if mode is not in options (do Default)
+        else:
+            s1, s2, s3 = separators
             if self.user_id:
-                self.bar = SPAN(prefix, user_identifier, '[',
+                self.bar = SPAN(prefix, user_identifier, s1,
                                 Anr(items[0]['name'],
-                                _href=items[0]['href']), ']',
+                                _href=items[0]['href']), s3,
                                 _class='auth_navbar')
             else:
-                self.bar = SPAN('[', Anr(items[0]['name'],
-                                _href=items[0]['href']), ']',
+                self.bar = SPAN(s1, Anr(items[0]['name'],
+                                _href=items[0]['href']), s3,
                                 _class='auth_navbar')
-            del items[0]
             for item in items:
-                self.bar.insert(-1, ']')
+                self.bar.insert(-1, s2)
                 self.bar.insert(-1, Anr(item['name'], _href=item['href']))
 
         return self.bar