diff --git a/classes/controller.php b/classes/controller.php
index eb152f4b..ebf22941 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -998,7 +998,8 @@ class AdminController
                     $obj->language($this->grav['session']->admin_lang);
                 }
             }
-            $this->setRedirect(($multilang ? ('/' . $obj->language()) : '') . '/admin/' . $this->view . $obj->route());
+
+            $this->setRedirect('/' . ($multilang ? ($obj->language()) : '') . $this->grav['uri']->route());
         }
 
         return true;
@@ -1185,9 +1186,9 @@ class AdminController
 
         $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_SWITCHED_LANGUAGE'), 'info');
 
-        $this->setRedirect('/' . $language .'/admin/' . $redirect);
+        $admin_route = $this->grav['config']->get('plugins.admin.route');
+        $this->setRedirect('/' . $language . $admin_route . '/' . $redirect);
 
-        return true;
     }
 
     /**