diff --git a/e2e/specs/server_management/add_server_modal.test.js b/e2e/specs/server_management/add_server_modal.test.js
index ee9c9c2449b..297992830bf 100644
--- a/e2e/specs/server_management/add_server_modal.test.js
+++ b/e2e/specs/server_management/add_server_modal.test.js
@@ -41,7 +41,7 @@ describe('Add Server Modal', function desc() {
     let newServerView;
 
     it('MM-T1312 should focus the first text input', async () => {
-        const isFocused = await newServerView.$eval('#teamNameInput', (el) => el === document.activeElement);
+        const isFocused = await newServerView.$eval('#teamNameInput', (el) => el.isSameNode(document.activeElement));
         isFocused.should.be.true;
     });
 
diff --git a/src/renderer/components/ConfigureServer.tsx b/src/renderer/components/ConfigureServer.tsx
index 3776588816c..f8beb044d8a 100644
--- a/src/renderer/components/ConfigureServer.tsx
+++ b/src/renderer/components/ConfigureServer.tsx
@@ -301,39 +301,39 @@ function ConfigureServer({
                                 </p>
                                 <div className='ConfigureServer__card-form'>
                                     <Input
-                                        name='name'
+                                        name='url'
                                         className='ConfigureServer__card-form-input'
                                         type='text'
                                         inputSize={SIZE.LARGE}
-                                        value={name}
-                                        onChange={handleNameOnChange}
-                                        customMessage={nameError ? ({
+                                        value={url}
+                                        onChange={handleURLOnChange}
+                                        customMessage={urlError ? ({
                                             type: STATUS.ERROR,
-                                            value: nameError,
+                                            value: urlError,
                                         }) : ({
                                             type: STATUS.INFO,
-                                            value: formatMessage({id: 'renderer.components.configureServer.name.info', defaultMessage: 'The name that will be displayed in your server list'}),
+                                            value: formatMessage({id: 'renderer.components.configureServer.url.info', defaultMessage: 'The URL of your Mattermost server'}),
                                         })}
-                                        placeholder={formatMessage({id: 'renderer.components.configureServer.name.placeholder', defaultMessage: 'Server display name'})}
+                                        placeholder={formatMessage({id: 'renderer.components.configureServer.url.placeholder', defaultMessage: 'Server URL'})}
                                         disabled={waiting}
                                         darkMode={darkMode}
                                     />
                                     <Input
-                                        name='url'
+                                        name='name'
                                         className='ConfigureServer__card-form-input'
                                         containerClassName='ConfigureServer__card-form-input-container'
                                         type='text'
                                         inputSize={SIZE.LARGE}
-                                        value={url}
-                                        onChange={handleURLOnChange}
-                                        customMessage={urlError ? ({
+                                        value={name}
+                                        onChange={handleNameOnChange}
+                                        customMessage={nameError ? ({
                                             type: STATUS.ERROR,
-                                            value: urlError,
+                                            value: nameError,
                                         }) : ({
                                             type: STATUS.INFO,
-                                            value: formatMessage({id: 'renderer.components.configureServer.url.info', defaultMessage: 'The URL of your Mattermost server'}),
+                                            value: formatMessage({id: 'renderer.components.configureServer.name.info', defaultMessage: 'The name that will be displayed in your server list'}),
                                         })}
-                                        placeholder={formatMessage({id: 'renderer.components.configureServer.url.placeholder', defaultMessage: 'Server URL'})}
+                                        placeholder={formatMessage({id: 'renderer.components.configureServer.name.placeholder', defaultMessage: 'Server display name'})}
                                         disabled={waiting}
                                         darkMode={darkMode}
                                     />