diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 7bd622882..a0e13e24e 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -621,7 +621,8 @@ service.gui.CONTINUE=Continue
 service.gui.SHOW_CERT=Show Certificate
 service.gui.HIDE_CERT=Hide Certificate
 
-service.gui.AUTO_ANSWER=Auto answer
+service.gui.AUTO_ANSWER=Auto Answer and Call Forwarding
+service.gui.AUTO_ANSWER_LABEL=Auto Answer
 service.gui.AUTO_ANSWER_ALL_CALLS=All calls
 service.gui.AUTO_ANSWER_ALERT_INFO_FIELDS=Only calls that require it. (Those containing an \"Alert-Info\" field set to \"Auto Answer\")
 service.gui.AUTO_ANSWER_CUSTOM_FIELDS=Calls with the following field and value
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
index 39d9216ed..304cd76e2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
@@ -681,7 +681,8 @@ private void initComponents()
 
             c.gridy = currentRow++;
             mainPanel.add(
-                getTitlePanel(R.getI18NString("service.gui.AUTO_ANSWER")), c);
+                getTitlePanel(R.getI18NString("service.gui.AUTO_ANSWER_LABEL")),
+                c);
 
             c.gridy = currentRow++;
             alwaysAnswerRadio = new SIPCommRadioButton(