diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index e0d088c18..489dac800 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -72,7 +72,7 @@ export default {
       addresses() {
          return this.entity.loaded.addresses.sort(
                (a, b) => a.street > b.street || Number(a.streetNumber) - Number(b.streetNumber)
-            )            
+            )      
       },
       street: {
          set(value) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index ece0e8c65..bc748f278 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -68,7 +68,9 @@ export default {
          return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
       },
       cities() {
-         return this.entity.loaded.cities;
+         return this.entity.loaded.cities.sort(
+               (a, b) => Number(a.code) - Number(b.code) || a.name > b.name
+            )
       },
       name: {
          set(value) {
@@ -92,7 +94,7 @@ export default {
    },
    methods: {
       transName(value) {
-         return (value.code && value.name) ? `${value.code}-${value.name}` : '';
+         return (value.code && value.name) ? `${value.name} (${value.code})` : '';
       },
       selectCity(value) {
          this.entity.selected.city = value;