diff --git a/Riot/Modules/Pills/PillsFormatter.swift b/Riot/Modules/Pills/PillsFormatter.swift
index ccee48317..e952ccbbe 100644
--- a/Riot/Modules/Pills/PillsFormatter.swift
+++ b/Riot/Modules/Pills/PillsFormatter.swift
@@ -159,7 +159,8 @@ private extension PillsFormatter {
     /// - Returns: userId, if any
     static func userIdFromPermalink(_ permalink: String) -> String? {
         let baseUrl: String
-        if let clientBaseUrl = BuildSettings.clientPermalinkBaseUrl {
+        // BWI: Take the permalinkbase url from our settings class
+        if let clientBaseUrl = AppConfigService.shared.permalinkUrl() {
             baseUrl = String(format: "%@/#/user/", clientBaseUrl)
         } else {
             baseUrl = String(format: "%@/#/", kMXMatrixDotToUrl)
diff --git a/bwi/AppConfig/AppConfigService.swift b/bwi/AppConfig/AppConfigService.swift
index 4eb7864c2..b2fbaf4c5 100644
--- a/bwi/AppConfig/AppConfigService.swift
+++ b/bwi/AppConfig/AppConfigService.swift
@@ -155,7 +155,7 @@ extension UserDefaults
         }
     }
     
-    func permalinkUrl() -> String {
+    func permalinkUrl() -> String? {
         if let url = appConfig.permalinkUrl {
             return "https://" + url
         }  else if let url = ServerURLHelper.shared.httpsPermalink() {
@@ -163,7 +163,7 @@ extension UserDefaults
         } else if let url = BuildSettings.clientPermalinkBaseUrl {
             return url
         } else {
-            return ""
+            return nil
         }
     }