diff --git a/Netdisco/Changes b/Netdisco/Changes
index d32d9220..86771988 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -23,6 +23,7 @@
   * Default class of a PoE port is 0 if not otherwise defined
   * Don't try to convert negative mW to dBm in AP power report
   * LDAP login fix (Daniel Tuecks)
+  * Custom path handling corrections (Daniel Tuecks)
 
 2.019003 - 2013-10-27
 
diff --git a/Netdisco/lib/App/Netdisco/Web/AuthN.pm b/Netdisco/lib/App/Netdisco/Web/AuthN.pm
index 4751017f..bb8afd7e 100644
--- a/Netdisco/lib/App/Netdisco/Web/AuthN.pm
+++ b/Netdisco/lib/App/Netdisco/Web/AuthN.pm
@@ -5,7 +5,7 @@ use Dancer::Plugin::DBIC;
 use Dancer::Plugin::Auth::Extensible;
 
 hook 'before' => sub {
-    params->{return_url} ||= '/inventory';
+    params->{return_url} ||= uri_for('/inventory');
 
     if (! session('logged_in_user') && request->path ne uri_for('/login')->path) {
         if (setting('trust_x_remote_user') and scalar request->header('X-REMOTE_USER')) {
diff --git a/Netdisco/share/views/js/common.js b/Netdisco/share/views/js/common.js
index 6385df6d..2b3f6836 100644
--- a/Netdisco/share/views/js/common.js
+++ b/Netdisco/share/views/js/common.js
@@ -6,7 +6,7 @@
 
     if (show.length) {
       $('#nd_csv-download')
-        .attr('href', '/ajax/content/' + type + '/' + tab + '?' + query)
+        .attr('href', uri_base + '/ajax/content/' + type + '/' + tab + '?' + query)
         .attr('download', 'netdisco-' + type + '-' + tab + '.csv')
         .show();
     }