1 files changed, 5 insertions, 2 deletions
diff --git a/app/php/pages/Login.php b/app/php/pages/Login.php
index d7be42b..c4d33c2 100644
--- a/app/php/pages/Login.php
+++ b/app/php/pages/Login.php
@@ -6,13 +6,16 @@ class Login extends TPage {
         if ($this->Page->IsValid) {
             $this->Response->redirect(
                 $this->Application->getModule('auth')->ReturnUrl
-                ?: NULL
+                ?: $this->Service->constructUrl(NULL)
             );
         }
     }
 
     public function validatePassword($sender, $param) {
-        $param->IsValid = $this->Application->getModule('auth')->login($this->Login->Text, $this->Password->Text);
+        $param->IsValid = $this->Application->getModule('auth')->login(
+            $this->Login->Text,
+            $this->Password->Text
+        );
     }
 
 }