diff --git a/Components/Repo/QuickCommands/QuickCommands.js b/Components/Repo/QuickCommands/QuickCommands.js
index c76a3a7..4208f18 100644
--- a/Components/Repo/QuickCommands/QuickCommands.js
+++ b/Components/Repo/QuickCommands/QuickCommands.js
@@ -16,10 +16,16 @@ export default function QuickCommands(props) {
         wizardEnv.SSH_SERVER_PORT_LAN
     ) {
         FQDN = wizardEnv.FQDN_LAN;
-        SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN;
+        SSH_SERVER_PORT =
+            wizardEnv.SSH_SERVER_PORT_LAN === 'false'
+                ? ''
+                : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
     } else {
         FQDN = wizardEnv.FQDN;
-        SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT;
+        SSH_SERVER_PORT =
+            wizardEnv.SSH_SERVER_PORT === 'false'
+                ? ''
+                : ':' + wizardEnv.SSH_SERVER_PORT;
     }
 
     //State
@@ -30,7 +36,7 @@ export default function QuickCommands(props) {
         // Asynchronously call copy to clipboard
         navigator.clipboard
             .writeText(
-                `ssh://${wizardEnv.UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.repositoryName}`
+                `ssh://${wizardEnv.UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.repositoryName}`
             )
             .then(() => {
                 // If successful, update the isCopied state value
@@ -50,7 +56,8 @@ export default function QuickCommands(props) {
                 <div className={classes.copyValid}>Copied !</div>
             ) : (
                 <div className={classes.tooltip}>
-                    ssh://{wizardEnv.UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                    ssh://{wizardEnv.UNIX_USER}@{FQDN}
+                    {SSH_SERVER_PORT}/./
                     {props.repositoryName}
                 </div>
             )}
diff --git a/Components/WizardSteps/WizardStep2/WizardStep2.js b/Components/WizardSteps/WizardStep2/WizardStep2.js
index 5963eaf..d6f4eb4 100644
--- a/Components/WizardSteps/WizardStep2/WizardStep2.js
+++ b/Components/WizardSteps/WizardStep2/WizardStep2.js
@@ -33,11 +33,12 @@ function WizardStep2(props) {
                 >
                     <div className={classes.code}>
                         borg init -e repokey-blake2 ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                     </div>
                     <CopyButton
-                        dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+                        dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
                     />
                 </div>
                 <div className={classes.note}>
@@ -57,8 +58,8 @@ function WizardStep2(props) {
             <div className={classes.separator}></div>
             <h2>Borgmatic</h2>
             <div className={classes.description}>
-                If you are using Borgmatic and have <b>already edited</b> the configuration file
-                (find a sample on the step 4) :
+                If you are using Borgmatic and have <b>already edited</b> the
+                configuration file (find a sample on the step 4) :
                 <br />
                 <div
                     style={{
@@ -88,11 +89,12 @@ function WizardStep2(props) {
                 >
                     <div className={classes.code}>
                         ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                     </div>
                     <CopyButton
-                        dataToCopy={`ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+                        dataToCopy={`ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
                     />
                 </div>
                 For more information about the Vorta graphical client, please
diff --git a/Components/WizardSteps/WizardStep3/WizardStep3.js b/Components/WizardSteps/WizardStep3/WizardStep3.js
index cb30a5c..d5b3ef8 100644
--- a/Components/WizardSteps/WizardStep3/WizardStep3.js
+++ b/Components/WizardSteps/WizardStep3/WizardStep3.js
@@ -32,12 +32,13 @@ function WizardStep3(props) {
                 >
                     <div className={classes.code}>
                         borg create ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                         ::archive1 /your/pathToBackup
                     </div>
                     <CopyButton
-                        dataToCopy={`borg create ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /your/pathToBackup`}
+                        dataToCopy={`borg create ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /your/pathToBackup`}
                     />
                 </div>
             </div>
@@ -78,11 +79,12 @@ function WizardStep3(props) {
                 >
                     <div className={classes.code}>
                         borg check -v --progress ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                     </div>
                     <CopyButton
-                        dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+                        dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
                     />
                 </div>
                 <li>List the remote archives with :</li>
@@ -95,11 +97,12 @@ function WizardStep3(props) {
                 >
                     <div className={classes.code}>
                         borg list ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                     </div>
                     <CopyButton
-                        dataToCopy={`borg list ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+                        dataToCopy={`borg list ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
                     />
                 </div>
                 <li>Download a remote archive with the following command :</li>
@@ -112,12 +115,13 @@ function WizardStep3(props) {
                 >
                     <div className={classes.code}>
                         borg export-tar --tar-filter="gzip -9" ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                         ::archive1 archive1.tar.gz
                     </div>
                     <CopyButton
-                        dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
+                        dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
                     />
                 </div>
                 <li>
@@ -133,12 +137,13 @@ function WizardStep3(props) {
                 >
                     <div className={classes.code}>
                         borg mount ssh://
-                        {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
+                        {UNIX_USER}@{FQDN}
+                        {SSH_SERVER_PORT}/./
                         {props.selectedOption.repositoryName}
                         ::archive1 /tmp/yourMountPoint
                     </div>
                     <CopyButton
-                        dataToCopy={`borg mount ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
+                        dataToCopy={`borg mount ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
                     />
                 </div>
                 <br />
diff --git a/Components/WizardSteps/WizardStep4/WizardStep4.js b/Components/WizardSteps/WizardStep4/WizardStep4.js
index 99dcc8d..a119975 100644
--- a/Components/WizardSteps/WizardStep4/WizardStep4.js
+++ b/Components/WizardSteps/WizardStep4/WizardStep4.js
@@ -23,7 +23,7 @@ function WizardStep4(props) {
 
 repositories:
     # Paths of local or remote repositories to backup to.
-    - ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}
+    - ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}
 
 storage:
     archive_name_format: '{FQDN}-documents-{now}'
diff --git a/helpers/functions/lanCommandOption.js b/helpers/functions/lanCommandOption.js
index 40918e0..14d5d69 100644
--- a/helpers/functions/lanCommandOption.js
+++ b/helpers/functions/lanCommandOption.js
@@ -3,10 +3,16 @@ export default function lanCommandOption(wizardEnv, lanCommand) {
     let SSH_SERVER_PORT;
     if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) {
         FQDN = wizardEnv.FQDN_LAN;
-        SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN;
+        SSH_SERVER_PORT =
+            wizardEnv.SSH_SERVER_PORT_LAN === 'false'
+                ? ''
+                : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
     } else {
         FQDN = wizardEnv.FQDN;
-        SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT;
+        SSH_SERVER_PORT =
+            wizardEnv.SSH_SERVER_PORT === 'false'
+                ? ''
+                : ':' + wizardEnv.SSH_SERVER_PORT;
     }
 
     return { FQDN, SSH_SERVER_PORT };