diff --git a/lib/galaxy/web/framework/__init__.py b/lib/galaxy/web/framework/__init__.py
index 436c91d7668..c982464ad10 100644
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -266,7 +266,7 @@ class UniverseWebTransaction( base.DefaultWebTransaction ):
             url_for( controller='user', action='reset_password' ),
             url_for( controller='library', action='browse' )
         )
-        if self.galaxy_session.user is None and environ['PATH_INFO'] not in allowed_paths:
+        if self.galaxy_session.user is None and self.request.path not in allowed_paths:
             self.response.send_redirect( url_for( controller='root', action='index' ) )
     def __create_new_session( self, prev_galaxy_session=None, user_for_new_session=None ):
         """
diff --git a/templates/admin/library/new_folder.mako b/templates/admin/library/new_folder.mako
index b8fca3b1ba6..8ce7207e96a 100644
--- a/templates/admin/library/new_folder.mako
+++ b/templates/admin/library/new_folder.mako
@@ -8,7 +8,7 @@
 <div class="toolForm">
     <div class="toolFormTitle">Create a new folder</div>
     <div class="toolFormBody">
-        <form name="folder" action="/admin/folder" method="post" >
+        <form name="folder" action="${h.url_for( controller='admin', action='folder' )}" method="post" >
             <div class="form-row">
                 <label>Name:</label>
                 <div style="float: left; width: 250px; margin-right: 10px;">
diff --git a/templates/admin/library/new_library.mako b/templates/admin/library/new_library.mako
index 8b33fad4c70..c514d2965b3 100644
--- a/templates/admin/library/new_library.mako
+++ b/templates/admin/library/new_library.mako
@@ -8,7 +8,7 @@
 <div class="toolForm">
     <div class="toolFormTitle">Create a new library</div>
     <div class="toolFormBody">
-        <form name="library" action="/admin/library" method="post" >
+        <form name="library" action="${h.url_for( controller='admin', action='library' )}" method="post" >
             <div class="form-row">
                 <label>Name:</label>
                 <div style="float: left; width: 250px; margin-right: 10px;">
diff --git a/templates/admin/library/rename_folder.mako b/templates/admin/library/rename_folder.mako
index 349fed2ecbe..8638edf60a1 100644
--- a/templates/admin/library/rename_folder.mako
+++ b/templates/admin/library/rename_folder.mako
@@ -8,7 +8,7 @@
 <div class="toolForm">
     <div class="toolFormTitle">Edit folder name and description</div>
     <div class="toolFormBody">
-        <form name="folder" action="/admin/folder" method="post" >
+        <form name="folder" action="${h.url_for( controller='admin', action='folder' )}" method="post" >
             <div class="form-row">
                 <label>Name:</label>
                 <div style="float: left; width: 250px; margin-right: 10px;">
diff --git a/templates/admin/library/rename_library.mako b/templates/admin/library/rename_library.mako
index 95f505e9046..9493ad1a7a3 100644
--- a/templates/admin/library/rename_library.mako
+++ b/templates/admin/library/rename_library.mako
@@ -8,7 +8,7 @@
 <div class="toolForm">
     <div class="toolFormTitle">Edit library name and description</div>
     <div class="toolFormBody">
-        <form name="library" action="/admin/library" method="post" >
+        <form name="library" action="${h.url_for( controller='admin', action='library' )}" method="post" >
             <div class="form-row">
                 <label>Name:</label>
                 <div style="float: left; width: 250px; margin-right: 10px;">