diff --git a/scripts/galaxy_messaging/server/setup_rabbitmq.py b/scripts/galaxy_messaging/server/setup_rabbitmq.py
index eba684797b2..9d670ead673 100644
--- a/scripts/galaxy_messaging/server/setup_rabbitmq.py
+++ b/scripts/galaxy_messaging/server/setup_rabbitmq.py
@@ -25,7 +25,7 @@ def main( config_file ):
     cmd_list = [
                 'add_user %s %s' % ( username, password ),
                 'add_vhost %s' % config.get( 'galaxy_amqp', 'virtual_host' ),
-                'set_permissions -p %s %s "%s.*" ".*" ".*"' % ( virtual_host, username, username )
+                'set_permissions -p %s %s ".*" ".*" ".*"' % ( virtual_host, username )
                ]
     
     for cmd in cmd_list:
diff --git a/templates/webapps/galaxy/base_panels.mako b/templates/webapps/galaxy/base_panels.mako
index 0a422f1d912..604345a6404 100644
--- a/templates/webapps/galaxy/base_panels.mako
+++ b/templates/webapps/galaxy/base_panels.mako
@@ -84,7 +84,7 @@
                          [ 'Find Samples', h.url_for( controller='/requests', action='find_samples_index' ) ],
                          [ 'Help', app.config.get( "lims_doc_url", "http://main.g2.bx.psu.edu/u/rkchak/p/sts" ), "galaxy_main" ]
                        ]
-        tab( "lab", "Lab", None, menu_options=menu_options, visible=( trans.user and trans.user.requests ) )
+        tab( "lab", "Lab", None, menu_options=menu_options, visible=( trans.user and ( trans.user.requests or trans.user.accessible_request_types() ) ) )
     %>
 
     ## Visualization menu.