diff --git a/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.form b/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.form
--- a/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.form
+++ b/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.form
@@ -62,6 +62,9 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="passwordLabel">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="userPasswordField"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/git/ui/repository/remote/Bundle.properties" key="UserPasswordPanel.passwordLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -76,6 +79,9 @@
     </Component>
     <Component class="javax.swing.JLabel" name="userLabel">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="userTextField"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/git/ui/repository/remote/Bundle.properties" key="UserPasswordPanel.userLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.java b/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.java
--- a/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.java
+++ b/git/src/org/netbeans/modules/git/ui/repository/remote/UserPasswordPanel.java
@@ -59,9 +59,11 @@
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
+        passwordLabel.setLabelFor(userPasswordField);
         org.openide.awt.Mnemonics.setLocalizedText(passwordLabel, org.openide.util.NbBundle.getMessage(UserPasswordPanel.class, "UserPasswordPanel.passwordLabel.text")); // NOI18N
         passwordLabel.setToolTipText(org.openide.util.NbBundle.getMessage(UserPasswordPanel.class, "UserPasswordPanel.passwordLabel.toolTipText")); // NOI18N
 
+        userLabel.setLabelFor(userTextField);
         org.openide.awt.Mnemonics.setLocalizedText(userLabel, org.openide.util.NbBundle.getMessage(UserPasswordPanel.class, "UserPasswordPanel.userLabel.text")); // NOI18N
         userLabel.setToolTipText(org.openide.util.NbBundle.getMessage(UserPasswordPanel.class, "UserPasswordPanel.userLabel.toolTipText")); // NOI18N