diff --git a/src/tdebluezauth/authdialog.ui b/src/tdebluezauth/authdialog.ui
index 8b0efcf..b36b6a0 100644
--- a/src/tdebluezauth/authdialog.ui
+++ b/src/tdebluezauth/authdialog.ui
@@ -39,8 +39,7 @@
             </property>
             <property name="text">
                 <string>&lt;font size="+2"&gt;Bluetooth Authorization Request&lt;/font&gt;
-&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; (device address &lt;b&gt;%2&lt;/b&gt;) %3.&lt;/p&gt;
-
+&lt;p&gt;%1&lt;/p&gt;
 &lt;p&gt;
 If you aren't sure about the identity of the other party, then reject 
 this authorization request.&lt;/p&gt;</string>
diff --git a/src/tdebluezauth/authorize.cpp b/src/tdebluezauth/authorize.cpp
index 26aa813..739c344 100644
--- a/src/tdebluezauth/authorize.cpp
+++ b/src/tdebluezauth/authorize.cpp
@@ -32,13 +32,15 @@ AuthorizeDialog::AuthorizeDialog(const TQString &addr, const TQString &devName,
                 KGuiItem(i18n("Accept"), "accept"),
                 KGuiItem(i18n("Reject"), "reject"))
 {
-    TQString action(i18n("wants to act as Input Device"));
+    TQString action;
 
-    if (!service.isEmpty())
-        action.append(" for " + service);
+    action = (service.isEmpty()
+              ? i18n("<b>%1</b> (device address <b>%2</b>) wants to act as Input Device.")
+              : i18n("<b>%1</b> (device address <b>%2</b>) wants to act as Input Device for %3.")).
+             arg(devName).arg(addr).arg(service);
 
     authDlg = new AuthDialog(this);
-    authDlg->messageLabel->setText(authDlg->messageLabel->text().arg(devName).arg(addr).arg(action));
+    authDlg->messageLabel->setText(authDlg->messageLabel->text().arg(action));
     connect(this, SIGNAL(okClicked()), SLOT(close()));
 
     setMainWidget(authDlg);