1 files changed, 9 insertions, 0 deletions
diff --git a/Timeline/Models/Validation/NameValidator.cs b/Timeline/Models/Validation/NameValidator.cs
index dec2b872..b74c40b7 100644
--- a/Timeline/Models/Validation/NameValidator.cs
+++ b/Timeline/Models/Validation/NameValidator.cs
@@ -1,10 +1,13 @@
 using System.Linq;
+using System.Text.RegularExpressions;
 using static Timeline.Resources.Models.Validation.NameValidator;
 
 namespace Timeline.Models.Validation
 {
     public class NameValidator : Validator<string>
     {
+        private static Regex UniqueIdRegex { get; } = new Regex(@"^[a-zA-Z0-9]{32}$");
+
         public const int MaxLength = 26;
 
         protected override (bool, string) DoValidate(string value)
@@ -27,6 +30,12 @@ namespace Timeline.Models.Validation
                 }
             }
 
+            // Currently name can't be longer than 26. So this is not needed. But reserve it for future use.
+            if (UniqueIdRegex.IsMatch(value))
+            {
+                return (false, MessageUnqiueId);
+            }
+
             return (true, GetSuccessMessage());
         }
     }