diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dd98239e..87d5403ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
   - Removed internal tools and utilities
   - Rebased the entire history to remove secrets and unrelated code
   - Cleaned up dead links
+- Fixed an error with input validation that prevented the use of upper-case letters in zip codes [#21](https://github.com/sovity/authority-portal/issues/21)
+- Changed order of industry select options [#22](https://github.com/sovity/authority-portal/issues/22)
 
 - Added notification when user clicks on copy button [#24](https://github.com/sovity/authority-portal/issues/24)
 
diff --git a/authority-portal-frontend/src/app/common/components/form-elements/industry-select/industry-select.component.ts b/authority-portal-frontend/src/app/common/components/form-elements/industry-select/industry-select.component.ts
index 67813c218..071242a07 100644
--- a/authority-portal-frontend/src/app/common/components/form-elements/industry-select/industry-select.component.ts
+++ b/authority-portal-frontend/src/app/common/components/form-elements/industry-select/industry-select.component.ts
@@ -10,7 +10,6 @@
  * Contributors:
  *      sovity GmbH - initial implementation
  */
-
 import {Component, HostBinding, Input} from '@angular/core';
 import {FormControl} from '@angular/forms';
 
@@ -49,7 +48,6 @@ export class IndustrySelectComponent {
     'Meteorological services',
     'Micromobility provider',
     'Municipality',
-    'Other',
     'Passenger transportation',
     'Research & Development',
     'Sensor supplier',
@@ -57,5 +55,6 @@ export class IndustrySelectComponent {
     'Telecommunication',
     'Tourism',
     'Traffic engineering',
+    'Other',
   ];
 }
diff --git a/authority-portal-frontend/src/app/core/utils/validators/zipcode-validator.ts b/authority-portal-frontend/src/app/core/utils/validators/zipcode-validator.ts
index bb7ef9c6b..e087193ce 100644
--- a/authority-portal-frontend/src/app/core/utils/validators/zipcode-validator.ts
+++ b/authority-portal-frontend/src/app/core/utils/validators/zipcode-validator.ts
@@ -14,7 +14,7 @@
 import {ValidatorFn} from '@angular/forms';
 import {namedRegexValidator} from './named-regex-validator';
 
-export const validZipCodePattern = /^[a-z0-9][a-z0-9\- ]{3,10}[a-z0-9]$/;
+export const validZipCodePattern = /^[a-zA-Z0-9][a-zA-Z0-9\- ]{3,10}[a-zA-Z0-9]$/;
 
 export const zipCodeValidator: ValidatorFn = namedRegexValidator(
   validZipCodePattern,