From 7915a2abb9d6deb0511c5ea51080bbdd9ec2301e Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Thu, 31 Dec 2020 14:18:49 +0100
Subject: [PATCH] Fix available_suffixes_more_info

---
 app/dashboard/views/custom_alias.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index a919263c..6f044470 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -92,15 +92,18 @@ def available_suffixes_more_info(user: User) -> [SuffixInfo]:
     # for each user domain, generate both the domain and a random suffix version
     for custom_domain in user_custom_domains:
         suffix = "@" + custom_domain.domain
-        suffixes.append(SuffixInfo(True, suffix, signer.sign(suffix).decode(), False))
+        suffix_info = SuffixInfo(True, suffix, signer.sign(suffix).decode(), False)
+
+        # put the default domain to top
+        if user.default_alias_custom_domain_id == custom_domain.id:
+            suffixes.insert(0, suffix_info)
+        else:
+            suffixes.append(suffix_info)
+
         if custom_domain.random_prefix_generation:
             suffix = "." + random_word() + "@" + custom_domain.domain
             suffix_info = SuffixInfo(True, suffix, signer.sign(suffix).decode(), False)
-            # put the default domain to top
-            if user.default_alias_custom_domain_id == custom_domain.id:
-                suffixes.insert(0, suffix_info)
-            else:
-                suffixes.append(suffix_info)
+            suffixes.append(suffix_info)
 
     # then SimpleLogin domain
     for sl_domain in user.get_sl_domains():