diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9caa0c7d..0b376eae1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Java version to plugin center url ([#1494](https://github.com/scm-manager/scm-manager/pull/1494))
 - Add Font ttf-dejavu to oci image ([#1498](https://github.com/scm-manager/scm-manager/issues/1498))
 
+### Changed
+- Layout of proxy settings ([#1502](https://github.com/scm-manager/scm-manager/pull/1502))
+
 ### Fixed
 - Add explicit provider setup for bouncy castle ([#1500](https://github.com/scm-manager/scm-manager/pull/1500))
 
diff --git a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
index 484cb6bfc9..859c08d11c 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
@@ -67,12 +67,11 @@ class ProxySettings extends React.Component<Props> {
         <div className="columns">
           <div className="column is-half">
             <InputField
-              label={t("proxySettings.password")}
-              onChange={this.handleProxyPasswordChange}
-              value={proxyPassword}
-              type="password"
+              label={t("proxySettings.server")}
+              value={proxyServer}
+              onChange={this.handleProxyServerChange}
               disabled={!enableProxy || !hasUpdatePermission}
-              helpText={t("proxySettings.passwordHelpText")}
+              helpText={t("proxySettings.serverHelpText")}
             />
           </div>
           <div className="column is-half">
@@ -86,15 +85,6 @@ class ProxySettings extends React.Component<Props> {
           </div>
         </div>
         <div className="columns">
-          <div className="column is-half">
-            <InputField
-              label={t("proxySettings.server")}
-              value={proxyServer}
-              onChange={this.handleProxyServerChange}
-              disabled={!enableProxy || !hasUpdatePermission}
-              helpText={t("proxySettings.serverHelpText")}
-            />
-          </div>
           <div className="column is-half">
             <InputField
               label={t("proxySettings.user")}
@@ -104,6 +94,16 @@ class ProxySettings extends React.Component<Props> {
               helpText={t("proxySettings.userHelpText")}
             />
           </div>
+          <div className="column is-half">
+            <InputField
+              label={t("proxySettings.password")}
+              onChange={this.handleProxyPasswordChange}
+              value={proxyPassword}
+              type="password"
+              disabled={!enableProxy || !hasUpdatePermission}
+              helpText={t("proxySettings.passwordHelpText")}
+            />
+          </div>
         </div>
         <div className="columns">
           <div className="column is-full">