diff --git a/engine/storage_redis.go b/engine/storage_redis.go
index 96dadb77c..ccd7e4f2d 100644
--- a/engine/storage_redis.go
+++ b/engine/storage_redis.go
@@ -39,12 +39,7 @@ type RedisStorage struct {
 }
 
 func NewRedisStorage(address string, db int, pass, mrshlerStr string) (*RedisStorage, error) {
-	ndb := &redis.Client{Addr: address, Db: db}
-	if pass != "" {
-		if err := ndb.Auth(pass); err != nil {
-			return nil, err
-		}
-	}
+	ndb := &redis.Client{Addr: address, Db: db, Password: pass}
 
 	var mrshler Marshaler
 	if mrshlerStr == utils.MSGPACK {
diff --git a/engine/tp_reader.go b/engine/tp_reader.go
index 5c56c4242..a9b704770 100644
--- a/engine/tp_reader.go
+++ b/engine/tp_reader.go
@@ -1087,7 +1087,7 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose bool) (err error) {
 		log.Print("Shared Groups:")
 	}
 	for k, sg := range tpr.sharedGroups {
-		err = accountingStorage.SetSharedGroup(sg)
+		err = tpr.accountingStorage.SetSharedGroup(sg)
 		if err != nil {
 			return err
 		}