diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java
index 4faac3590254..73353cf03824 100644
--- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java
+++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java
@@ -87,6 +87,13 @@ public class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> {
       myNoteLabel.setVisible(true);
     }
 
-    myPasswordLabel.setText(myRepository.isInCloud() ? "API Token:" : "Password:");
+    if (myRepository.isInCloud()) {
+      myUsernameLabel.setText("Email:");
+      myPasswordLabel.setText("API Token:");
+    }
+    else {
+      myUsernameLabel.setText("Username:");
+      myPasswordLabel.setText("Password:");
+    }
   }
 }