diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs
index bd27cddb8a..de3511d6fa 100644
--- a/frontend/src/app/main/data/users.cljs
+++ b/frontend/src/app/main/data/users.cljs
@@ -143,7 +143,9 @@
     (if (and (= :authorization (:type data))
              (= :challenge-required (:code data)))
       (let [path (rt/get-current-path)
-            href (str "/challenge.html?redirect=" path)]
+            href (-> path
+                     (str "/challenge.html?redirect=")
+                     (js/encodeURIComponent))]
         (rx/of (rt/nav-raw href)))
       (rx/throw cause))))
 
diff --git a/frontend/src/app/util/router.cljs b/frontend/src/app/util/router.cljs
index cb17f1a80b..aab6a4249d 100644
--- a/frontend/src/app/util/router.cljs
+++ b/frontend/src/app/util/router.cljs
@@ -13,7 +13,7 @@
    [app.main.data.events :as ev]
    [app.util.browser-history :as bhistory]
    [app.util.dom :as dom]
-   [app.util.globals :as globals]   
+   [app.util.globals :as globals]
    [app.util.timers :as ts]
    [beicon.v2.core :as rx]
    [cuerdas.core :as str]