diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
index a071c64ca8b6b0409a0f11640437339153bae7fd..93ac27eda5a94d8537d3233db4d98ac1a8d3477a 100644
--- a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
+++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
@@ -47,6 +47,17 @@ class EeloAuthenticatorFragment : Fragment() {
         val view = inflater.inflate(R.layout.fragment_eelo_authenticator, container, false)
 
         view.urlpwd_other_account_title_panel.setOnClickListener(){ expandCollapse() }
+        view.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus ->
+            if (!hasFocus ) {
+                if (v.urlpwd_user_name.text.toString().contains("@")) {
+                    val dns = v.urlpwd_user_name.text.toString().substringAfter("@")
+                    val pre_custom_url = "https://" + dns
+                    view.urlpwd_server_uri.setText(pre_custom_url)
+                } else {
+                    view.urlpwd_server_uri.setText("")
+                }
+            }
+        }
 
         view.login.setOnClickListener { login() }