diff --git a/kmymoney/mymoney/mymoneycontact.h b/kmymoney/mymoney/mymoneycontact.h
--- a/kmymoney/mymoney/mymoneycontact.h
+++ b/kmymoney/mymoney/mymoneycontact.h
@@ -31,6 +31,8 @@
   QString email;
   QString phoneNumber;
   QString street;
+  QString city;
+  QString state;
   QString locality;
   QString country;
   QString region;
diff --git a/kmymoney/views/kpayeesview.cpp b/kmymoney/views/kpayeesview.cpp
--- a/kmymoney/views/kpayeesview.cpp
+++ b/kmymoney/views/kpayeesview.cpp
@@ -290,6 +290,10 @@
 
     d->ui->addressEdit->setEnabled(true);
     d->ui->addressEdit->setText(d->m_payee.address());
+    d->ui->payeecityEdit->setEnabled(true);
+    d->ui->payeecityEdit->setText(d->m_payee.city());
+    d->ui->payeestateEdit->setEnabled(true);
+    d->ui->payeestateEdit->setText(d->m_payee.state());
     d->ui->postcodeEdit->setEnabled(true);
     d->ui->postcodeEdit->setText(d->m_payee.postcode());
     d->ui->telephoneEdit->setEnabled(true);
@@ -349,6 +353,10 @@
            || (!d->ui->emailEdit->text().isEmpty() && d->m_payee.email() != d->ui->emailEdit->text()));
     rc |= ((d->m_payee.address().isEmpty() != d->ui->addressEdit->toPlainText().isEmpty())
            || (!d->ui->addressEdit->toPlainText().isEmpty() && d->m_payee.address() != d->ui->addressEdit->toPlainText()));
+    rc |= ((d->m_payee.city().isEmpty() != d->ui->payeecityEdit->text().isEmpty())
+           || (!d->ui->payeecityEdit->text().isEmpty() && d->m_payee.city() != d->ui->payeecityEdit->text()));
+    rc |= ((d->m_payee.state().isEmpty() != d->ui->payeestateEdit->text().isEmpty())
+           || (!d->ui->payeestateEdit->text().isEmpty() && d->m_payee.state() != d->ui->payeestateEdit->text()));
     rc |= ((d->m_payee.postcode().isEmpty() != d->ui->postcodeEdit->text().isEmpty())
            || (!d->ui->postcodeEdit->text().isEmpty() && d->m_payee.postcode() != d->ui->postcodeEdit->text()));
     rc |= ((d->m_payee.telephone().isEmpty() != d->ui->telephoneEdit->text().isEmpty())
@@ -411,6 +419,8 @@
     try {
       d->m_payee.setName(d->m_newName);
       d->m_payee.setAddress(d->ui->addressEdit->toPlainText());
+      d->m_payee.setCity(d->ui->payeecityEdit->text());
+      d->m_payee.setState(d->ui->payeestateEdit->text());
       d->m_payee.setPostcode(d->ui->postcodeEdit->text());
       d->m_payee.setTelephone(d->ui->telephoneEdit->text());
       d->m_payee.setEmail(d->ui->emailEdit->text());
@@ -451,6 +461,8 @@
     if (auto item = dynamic_cast<KPayeeListItem*>(d->ui->m_payeesList->currentItem())) { // update ui if something is selected
       d->m_payee = item->payee();
       d->ui->addressEdit->setText(d->m_payee.address());
+      d->ui->payeecityEdit->setText(d->m_payee.city());
+      d->ui->payeestateEdit->setText(d->m_payee.state());
       d->ui->postcodeEdit->setText(d->m_payee.postcode());
       d->ui->telephoneEdit->setText(d->m_payee.telephone());
     }
@@ -475,8 +487,8 @@
       txt.append(identity.street + '\n');
     if (!identity.locality.isEmpty()) {
       txt.append(identity.locality);
-      if (!identity.postalCode.isEmpty())
-        txt.append(' ' + identity.postalCode + '\n');
+    if (!identity.postalCode.isEmpty())
+      txt.append(' ' + identity.postalCode + '\n');
       else
         txt.append('\n');
     }
@@ -486,6 +498,12 @@
     if (!txt.isEmpty() && d->m_payee.address().compare(txt) != 0)
       d->m_payee.setAddress(txt);
 
+    if (!identity.city.isEmpty() && d->m_payee.city().compare(identity.city) != 0)
+      d->m_payee.setCity(identity.city);
+
+    if (!identity.state.isEmpty() && d->m_payee.state().compare(identity.state) != 0)
+      d->m_payee.setState(identity.state);
+
     if (!identity.postalCode.isEmpty() && d->m_payee.postcode().compare(identity.postalCode) != 0)
       d->m_payee.setPostcode(identity.postalCode);
 
diff --git a/kmymoney/views/kpayeesview.ui b/kmymoney/views/kpayeesview.ui
--- a/kmymoney/views/kpayeesview.ui
+++ b/kmymoney/views/kpayeesview.ui
@@ -164,7 +164,7 @@
         <property name="spacing">
          <number>4</number>
         </property>
-        <item row="3" column="0">
+        <item row="5" column="0">
          <widget class="QLabel" name="TextLabel7">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -187,6 +187,50 @@
          </widget>
         </item>
         <item row="1" column="0">
+         <widget class="QLabel" name="TextLabel5_1">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>City:</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="TextLabel5_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>State:</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
          <widget class="QLabel" name="TextLabel5">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -208,7 +252,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="TextLabel6">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -230,7 +274,7 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="TextLabel4_2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -255,7 +299,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="5" column="1">
          <widget class="KLineEdit" name="emailEdit"/>
         </item>
         <item row="0" column="0">
@@ -283,7 +327,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="5" column="2">
                      <widget class="QPushButton" name="m_sendMail">
              <property name="toolTip">
               <string>Creates new e-mail to your payee.</string>
@@ -296,10 +340,16 @@
              </property>
             </widget>
         </item>
-        <item row="2" column="1" colspan="2">
+        <item row="4" column="1" colspan="2">
          <widget class="KLineEdit" name="telephoneEdit"/>
         </item>
         <item row="1" column="1" colspan="2">
+         <widget class="KLineEdit" name="payeecityEdit"/>
+        </item>
+        <item row="2" column="1" colspan="2">
+         <widget class="KLineEdit" name="payeestateEdit"/>
+        </item>
+        <item row="3" column="1" colspan="2">
          <widget class="KLineEdit" name="postcodeEdit"/>
         </item>
         <item row="0" column="1" colspan="2">
@@ -312,7 +362,7 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="1" colspan="2">
+        <item row="6" column="1" colspan="2">
          <widget class="KTextEdit" name="notesEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -576,6 +626,8 @@
   <tabstop>m_mergeButton</tabstop>
   <tabstop>m_filterBox</tabstop>
   <tabstop>addressEdit</tabstop>
+  <tabstop>payeecityEdit</tabstop>
+  <tabstop>payeestateEdit</tabstop>
   <tabstop>postcodeEdit</tabstop>
   <tabstop>telephoneEdit</tabstop>
   <tabstop>emailEdit</tabstop>
diff --git a/kmymoney/views/kpayeesview_p.h b/kmymoney/views/kpayeesview_p.h
--- a/kmymoney/views/kpayeesview_p.h
+++ b/kmymoney/views/kpayeesview_p.h
@@ -227,6 +227,8 @@
     q->connect(ui->m_mergeButton,   &QAbstractButton::clicked, q, &KPayeesView::slotMergePayee);
 
     q->connect(ui->addressEdit,   &QTextEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
+    q->connect(ui->payeecityEdit,  &QLineEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
+    q->connect(ui->payeestateEdit,  &QLineEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
     q->connect(ui->postcodeEdit,  &QLineEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
     q->connect(ui->telephoneEdit, &QLineEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
     q->connect(ui->emailEdit,     &QLineEdit::textChanged, q, &KPayeesView::slotPayeeDataChanged);
@@ -358,6 +360,8 @@
   void clearItemData()
   {
     ui->addressEdit->setText(QString());
+    ui->payeecityEdit->setText(QString());
+    ui->payeestateEdit->setText(QString());
     ui->postcodeEdit->setText(QString());
     ui->telephoneEdit->setText(QString());
     ui->emailEdit->setText(QString());