diff --git a/lib/NGCP/Panel/Controller/Login.pm b/lib/NGCP/Panel/Controller/Login.pm
index d4d0628931..5992183b14 100644
--- a/lib/NGCP/Panel/Controller/Login.pm
+++ b/lib/NGCP/Panel/Controller/Login.pm
@@ -76,7 +76,6 @@ sub index :Path Form {
                 }, 
                 $realm);
         } elsif($realm eq 'subscriber') {
-            # TODO: check for lock status?
             my ($u, $d) = split /\@/, $user;
             unless($d) {
                 $d = $c->req->uri->host;
@@ -85,8 +84,9 @@ sub index :Path Form {
                 webusername => $u,
                 webpassword => $pass,
                 'domain.domain' => $d,
+                'contract.status' => 'active',
             }, {
-                join => 'domain',
+                join => ['domain', 'contract'],
             });
             $res = $c->authenticate(
                 {