diff --git a/system/commands/settings.go b/system/commands/settings.go
index bfc117e8a..fa7d79a86 100644
--- a/system/commands/settings.go
+++ b/system/commands/settings.go
@@ -2,7 +2,6 @@ package commands
 
 import (
 	"encoding/json"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
 	"os"
 	"strings"
 
diff --git a/system/commands/users.go b/system/commands/users.go
index 7eec1a934..667513112 100644
--- a/system/commands/users.go
+++ b/system/commands/users.go
@@ -2,8 +2,6 @@ package commands
 
 import (
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/rh"
 	"strconv"
 	"syscall"
 
@@ -13,6 +11,7 @@ import (
 
 	"github.com/cortezaproject/corteza-server/pkg/auth"
 	"github.com/cortezaproject/corteza-server/pkg/cli"
+	"github.com/cortezaproject/corteza-server/pkg/rh"
 	"github.com/cortezaproject/corteza-server/system/repository"
 	"github.com/cortezaproject/corteza-server/system/service"
 	"github.com/cortezaproject/corteza-server/system/types"