diff --git a/IVPNClient/Models/ServiceStatus.swift b/IVPNClient/Models/ServiceStatus.swift
index 9da217960..6d78209cf 100644
--- a/IVPNClient/Models/ServiceStatus.swift
+++ b/IVPNClient/Models/ServiceStatus.swift
@@ -116,7 +116,7 @@ struct ServiceStatus: Codable {
     func isLegacyAccount() -> Bool {
         let accountId = KeyChain.username ?? ""
         
-        if accountId.hasPrefix("ivpn") && currentPlan.hasPrefix("IVPN Pro") && currentPlan != "IVPN Pro" {
+        if accountId.hasPrefix("ivpn") && currentPlan.contains("VPN Pro") && currentPlan != "IVPN Pro" {
             return true
         }
         
diff --git a/IVPNClient/Scenes/Signup/LoginViewController.swift b/IVPNClient/Scenes/Signup/LoginViewController.swift
index 36042b089..14a3b5eac 100644
--- a/IVPNClient/Scenes/Signup/LoginViewController.swift
+++ b/IVPNClient/Scenes/Signup/LoginViewController.swift
@@ -279,6 +279,9 @@ extension LoginViewController {
         KeyChain.username = (self.userName.text ?? "").trim()
         
         guard !Application.shared.serviceStatus.isLegacyAccount() else {
+            navigationController?.dismiss(animated: true, completion: {
+                NotificationCenter.default.post(name: Notification.Name.UpdateFloatingPanelLayout, object: nil)
+            })
             return
         }