diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index 28ab6b83f704f4a9d28a575c0bc301d2140a78ad..10d1109961f391e9d29d82eceaa227a6c0aaa530 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -17,7 +17,7 @@ protocol LoginView: AnyObject {
 class LoginViewController: UIViewController {
     private let serverProtocol = "https://"
     private static let kValidServerPattern = try? NSRegularExpression(pattern: #"^[-a-z0-9]+(?:\.[-a-z0-9]+)*\.?(?::\d+)?$"#, options: .caseInsensitive)
-    private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-z0-9]+"#, options: .caseInsensitive)
+    private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-z0-9]+(?:[-a-z0-9]+)*?(?::\d+)?$"#, options: .caseInsensitive)
 
     @IBOutlet private var appVersionLabel: UILabel!
     @IBOutlet private var urlStackView: UIStackView!