diff --git a/IncBackups/IncBackupsControl.py b/IncBackups/IncBackupsControl.py
index efd5ba46b..10b8f5a96 100644
--- a/IncBackups/IncBackupsControl.py
+++ b/IncBackups/IncBackupsControl.py
@@ -455,23 +455,20 @@ class IncJobs(multi.Thread):
                     userToTry = items.dbUser
                 except:
                     dbusers = DBUsers.objects.all().filter(user=items.dbUser)
-                    userToTry = items.dbUser
                     for it in dbusers:
                         dbuser = it
                         break
 
-                    userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
-
-                    if userToTry == 0:
-                        userToTry = items.dbName
+                    userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbName)
 
                     try:
                         dbuser = DBUsers.objects.get(user=userToTry)
                     except:
                         dbusers = DBUsers.objects.all().filter(user=userToTry)
                         for it in dbusers:
-                            dbuser = it
-                            break
+                            if it.find('_') > -1:
+                                dbuser = it
+                                break
 
                 databaseXML = Element('database')
 
diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py
index 1a1a162f2..dacbf0d93 100755
--- a/plogical/backupUtilities.py
+++ b/plogical/backupUtilities.py
@@ -113,7 +113,7 @@ class backupUtilities:
                             dbuser = it
                             break
 
-                        userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
+                        userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbName)
 
                         try:
                             dbuser = DBUsers.objects.get(user=userToTry)
@@ -121,8 +121,9 @@ class backupUtilities:
                             try:
                                 dbusers = DBUsers.objects.all().filter(user=userToTry)
                                 for it in dbusers:
-                                    dbuser = it
-                                    break
+                                    if it.find('_') > -1:
+                                        dbuser = it
+                                        break
                             except BaseException as msg:
                                 logging.CyberCPLogFileWriter.writeToFile(
                                     'While creating backup for %s, we failed to backup database %s. Error message: %s' % (