diff --git a/resources/scripts/components/admin/mounts/MountsContainer.tsx b/resources/scripts/components/admin/mounts/MountsContainer.tsx
index 10f95f03e..87240a6e9 100644
--- a/resources/scripts/components/admin/mounts/MountsContainer.tsx
+++ b/resources/scripts/components/admin/mounts/MountsContainer.tsx
@@ -1,4 +1,3 @@
-import CopyOnClick from '@/components/elements/CopyOnClick';
 import React, { useContext, useEffect, useState } from 'react';
 import getMounts, { Context as MountsContext } from '@/api/admin/mounts/getMounts';
 import FlashMessageRender from '@/components/FlashMessageRender';
@@ -10,6 +9,7 @@ import AdminContentBlock from '@/components/admin/AdminContentBlock';
 import AdminCheckbox from '@/components/admin/AdminCheckbox';
 import AdminTable, { TableBody, TableHead, TableHeader, TableRow, Pagination, Loading, NoItems, ContentWrapper } from '@/components/admin/AdminTable';
 import Button from '@/components/elements/Button';
+import CopyOnClick from '@/components/elements/CopyOnClick';
 
 const RowCheckbox = ({ id }: { id: number}) => {
     const isChecked = AdminContext.useStoreState(state => state.mounts.selectedMounts.indexOf(id) >= 0);
diff --git a/resources/scripts/components/admin/nodes/NodeSettingsContainer.tsx b/resources/scripts/components/admin/nodes/NodeSettingsContainer.tsx
index 0ac16c096..5c4c35d23 100644
--- a/resources/scripts/components/admin/nodes/NodeSettingsContainer.tsx
+++ b/resources/scripts/components/admin/nodes/NodeSettingsContainer.tsx
@@ -18,6 +18,10 @@ interface Values {
     description: string;
     locationId: number;
     fqdn: string;
+    listenPort: number;
+    publicPort: number;
+    listenPortSFTP: number;
+    publicPortSFTP: number;
 }
 
 export default () => {
@@ -53,6 +57,10 @@ export default () => {
                 description: node.description || '',
                 locationId: node.locationId,
                 fqdn: node.fqdn,
+                listenPort: node.daemonListen,
+                publicPort: node.daemonListen,
+                listenPortSFTP: node.daemonSftp,
+                publicPortSFTP: node.daemonSftp,
             }}
             validationSchema={object().shape({
                 name: string().required().max(191),
@@ -97,6 +105,46 @@ export default () => {
                                     />
                                 </div>
 
+                                <div css={tw`md:w-full md:flex md:flex-row mb-6`}>
+                                    <div css={tw`md:w-full md:flex md:flex-col md:mr-4 mb-6 md:mb-0`}>
+                                        <Field
+                                            id={'listenPort'}
+                                            name={'listenPort'}
+                                            label={'Listen Port'}
+                                            type={'number'}
+                                        />
+                                    </div>
+
+                                    <div css={tw`md:w-full md:flex md:flex-col md:ml-4 mb-6 md:mb-0`}>
+                                        <Field
+                                            id={'publicPort'}
+                                            name={'publicPort'}
+                                            label={'Public Port'}
+                                            type={'number'}
+                                        />
+                                    </div>
+                                </div>
+
+                                <div css={tw`md:w-full md:flex md:flex-row mb-6`}>
+                                    <div css={tw`md:w-full md:flex md:flex-col md:mr-4 mb-6 md:mb-0`}>
+                                        <Field
+                                            id={'listenPortSFTP'}
+                                            name={'listenPortSFTP'}
+                                            label={'SFTP Listen Port'}
+                                            type={'number'}
+                                        />
+                                    </div>
+
+                                    <div css={tw`md:w-full md:flex md:flex-col md:ml-4 mb-6 md:mb-0`}>
+                                        <Field
+                                            id={'publicPortSFTP'}
+                                            name={'publicPortSFTP'}
+                                            label={'SFTP Public Port'}
+                                            type={'number'}
+                                        />
+                                    </div>
+                                </div>
+
                                 <div css={tw`w-full flex flex-row items-center`}>
                                     <div css={tw`flex ml-auto`}>
                                         <Button type={'submit'} disabled={isSubmitting || !isValid}>
diff --git a/resources/scripts/routers/AdminRouter.tsx b/resources/scripts/routers/AdminRouter.tsx
index 59ffb7884..c2319a145 100644
--- a/resources/scripts/routers/AdminRouter.tsx
+++ b/resources/scripts/routers/AdminRouter.tsx
@@ -1,12 +1,12 @@
-import { breakpoint } from '@/theme';
 import React, { useState } from 'react';
 import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { State, useStoreState } from 'easy-peasy';
 import tw from 'twin.macro';
 import styled from 'styled-components/macro';
+import { breakpoint } from '@/theme';
 import { ApplicationStore } from '@/state';
 import { AdminContext } from '@/state/admin';
-import NotFound from '@/components/screens/NotFound';
+import { NotFound } from '@/components/elements/ScreenBlock';
 import OverviewContainer from '@/components/admin/overview/OverviewContainer';
 import SettingsContainer from '@/components/admin/settings/SettingsContainer';
 import ApiKeysContainer from '@/components/admin/api/ApiKeysContainer';