diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index b988cb29..ed770eeb 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -66,7 +66,8 @@ class Index extends Backend
      */
     public function login()
     {
-        $url = $this->request->get('url', 'index/index', 'url_clean');
+        $url = $this->request->get('url', '', 'url_clean');
+        $url = $url ?: 'index/index';
         if ($this->auth->isLogin()) {
             $this->success(__("You've logged in, do not login again"), $url);
         }
diff --git a/application/common.php b/application/common.php
index 3465f844..6123f316 100755
--- a/application/common.php
+++ b/application/common.php
@@ -514,7 +514,7 @@ if (!function_exists('check_url_allowed')) {
         }
 
         //如果是站内相对链接则允许
-        if (preg_match("/^[\/a-z][a-z0-9][a-z0-9\.\/]+\$/i", $url) && substr($url, 0, 2) !== '//') {
+        if (preg_match("/^[\/a-z][a-z0-9][a-z0-9\.\/]+((\?|#).*)?\$/i", $url) && substr($url, 0, 2) !== '//') {
             return true;
         }