diff --git a/apps/assets/const/database.py b/apps/assets/const/database.py
index 875cd64a0..7bf1aaf44 100644
--- a/apps/assets/const/database.py
+++ b/apps/assets/const/database.py
@@ -63,7 +63,20 @@ class DatabaseTypes(BaseType):
             cls.SQLSERVER: [{'name': 'SQLServer'}],
             cls.CLICKHOUSE: [{'name': 'ClickHouse'}],
             cls.MONGODB: [{'name': 'MongoDB'}],
-            cls.REDIS: [{'name': 'Redis'}, {'name': 'Redis6+'}],
+            cls.REDIS: [
+                {
+                    'name': 'Redis',
+                    'protocols_setting': {
+                        'redis': {'auth_username': False}
+                    }
+                },
+                {
+                    'name': 'Redis6+',
+                    'protocols_setting': {
+                        'redis': {'auth_username': True}
+                    }
+                }
+            ]
         }
 
     @classmethod
diff --git a/apps/assets/const/types.py b/apps/assets/const/types.py
index c42695840..509c2f58e 100644
--- a/apps/assets/const/types.py
+++ b/apps/assets/const/types.py
@@ -304,7 +304,7 @@ class AllTypes(ChoicesMixin):
                         setting = _protocols_setting.get(p['name'], {})
                         p['required'] = p.pop('required', False)
                         p['default'] = p.pop('default', False)
-                        p['setting'] = {**setting, **p.get('setting', {})}
+                        p['setting'] = {**p.get('setting', {}), **setting}
 
                     platform_data = {
                         **default_platform_data, **d,
diff --git a/apps/audits/signal_handlers/activity_log.py b/apps/audits/signal_handlers/activity_log.py
index 6766d5d53..8254dce93 100644
--- a/apps/audits/signal_handlers/activity_log.py
+++ b/apps/audits/signal_handlers/activity_log.py
@@ -119,7 +119,7 @@ class ActivityLogHandler(object):
     def login_log_for_activity(obj):
         login_status = _('Success') if obj.status else _('Failed')
         detail = _('User {} login this system {}').format(
-            obj.name, login_status
+            obj.username, login_status
         )
         user_id = User.objects.filter(username=obj.username).values('id').first()
         return user_id['id'], detail, ActivityChoices.login_log