diff --git a/src/core/qfieldappauthrequesthandler.cpp b/src/core/qfieldappauthrequesthandler.cpp
index 6fa4757dc2..d453237e40 100644
--- a/src/core/qfieldappauthrequesthandler.cpp
+++ b/src/core/qfieldappauthrequesthandler.cpp
@@ -223,5 +223,14 @@ QString QFieldAppAuthRequestHandler::getCredentialTitle( const QString &realm )
   if ( uri.database().isEmpty() )
     return realm;
 
-  return "Please enter credentials for database <b>" + uri.database() + "</b> at host <b>" + uri.host() + ".</b>";
+  QString title = tr( "Please enter credentials for database" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.database() );
+  if ( !uri.host().isEmpty() )
+  {
+    title += tr( "at host" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.host() );
+  }
+  else if ( !uri.service().isEmpty() )
+  {
+    title += tr( "at service" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.service() );
+  }
+  return title;
 }
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
index 142fc059e9..6380e4d557 100644
--- a/src/qml/qgismobileapp.qml
+++ b/src/qml/qgismobileapp.qml
@@ -3620,10 +3620,10 @@ ApplicationWindow {
     Popup {
       id: loginDialogPopup
       parent: Overlay.overlay
-      x: 24
-      y: 24
-      width: parent.width - 48
-      height: parent.height - 48
+      x: Theme.popupScreenEdgeMargin
+      y: Theme.popupScreenEdgeMargin
+      width: parent.width - Theme.popupScreenEdgeMargin * 2
+      height: parent.height - Theme.popupScreenEdgeMargin * 2
       padding: 0
       modal: true
       closePolicy: Popup.CloseOnEscape