diff --git a/user.inc.php b/user.inc.php
index 700b406..c3147de 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -493,6 +493,11 @@ function user_personal_required_fields($type)
 			$ret = array_merge($ret, $user_personal_fields_map[$f]);
 		}
 	}
+	/* Filter some elements that are never required.  
+	 *	- address2
+	 */
+	$ret = array_diff($ret, array('address2'));
+
 	return $ret;
 }
 
diff --git a/user_personal.php b/user_personal.php
index cfd23cf..8132a21 100644
--- a/user_personal.php
+++ b/user_personal.php
@@ -194,10 +194,10 @@ item($u, "Password", 'password');
 echo "</tr>\n";
 echo "<tr>\n";
 item($u, "Address 1", 'address');
-item($u, "Address 2", 'address2');
+item($u, "City", 'city');
 echo "</tr>\n";
 echo "<tr>\n";
-item($u, "City", 'city');
+item($u, "Address 2", 'address2');
  if(in_array('province', $fields)) {
 	echo '<td>'.i18n('Province').': </td>';
 	echo '<td>';