diff --git a/bin/ncp/SECURITY/multi-factor-authentication.sh b/bin/ncp/SECURITY/multi-factor-authentication.sh
new file mode 100755
index 000000000..2c8c754f2
--- /dev/null
+++ b/bin/ncp/SECURITY/multi-factor-authentication.sh
@@ -0,0 +1,291 @@
+#!/usr/bin/env bash
+
+# Authentication Options:
+# =======================
+# * Password
+# * Pubkey
+# * TOTP + Password
+# (* TOTP + Pubkey + Password) not yet supported
+# * TOTP + Password / TOTP + Pubkey
+
+PAMD_PATH="/etc/pam.d"
+PAMD_BACKUP_PATH="/etc/pam.backup"
+SSHD_CONFIG_PATH="/etc/ssh/sshd_config"
+
+
+# Configure pam.d/sshd config
+# ======================
+
+patch_pam_ssh_config() {
+  local cfg
+
+  if [[ "$1" == "--reset" ]]
+  then
+    if [[ -f "${PAMD_BACKUP_PATH}/sshd" ]]; then
+      echo "Restoring original configuration for '${PAMD_PATH}/sshd'..."
+      mv "${PAMD_BACKUP_PATH}/sshd" "${PAMD_PATH}/sshd" || return 1
+      [[ -f "${PAMD_PATH}/sshd-mfa" ]] && rm "${PAMD_PATH}/sshd-mfa"
+      return 0
+    else
+      echo "ERROR: Could not restore '${PAMD_PATH}/sshd' from backup '${PAMD_BACKUP_PATH}/sshd' (not found)!"
+      return 1
+    fi
+  fi
+
+  mkdir -p "$PAMD_BACKUP_PATH"
+  [[ -f "${PAMD_BACKUP_PATH}/sshd" ]] || {
+    echo "Backing up '${PAMD_PATH}/sshd'..."
+    cp "${PAMD_PATH}/sshd" "${PAMD_BACKUP_PATH}/sshd"
+  } || {
+    echo "Error creating backup. '${PAMD_PATH}/sshd will remain unchanged!"
+    return 1
+  }
+
+  echo "Writing pam configuration..."
+  if [[ "$enable_totp_and_pw" != "yes" ]]
+  then
+    cp "${PAMD_BACKUP_PATH}/sshd" "${PAMD_PATH}/sshd" || return 1
+    [[ -f "${PAMD_PATH}/sshd-mfa" ]] && rm "${PAMD_PATH}/sshd-mfa"
+    return 0
+  fi
+  echo "" > "${PAMD_PATH}/sshd-mfa" || return 1
+
+  if [[ "$enable_totp_and_pw" == "yes" ]]; then
+    echo "auth required pam_google_authenticator.so nullok" >> "${PAMD_PATH}/sshd-mfa"
+  fi
+  echo "@include common-auth" >> "${PAMD_PATH}/sshd-mfa"
+
+  sed 's/@include.*common-auth/@include sshd-mfa/g' "${PAMD_BACKUP_PATH}/sshd" > "${PAMD_PATH}/sshd" || return 1
+
+
+}
+
+# Configure sshd_config
+# =====================
+
+#sshd_authentication_options=("password" "publickey" "publickey,password" "keyboard-interactive"
+#  "keyboard-interactive,publickey" "keyboard-interactive,publickey keyboard-interactive,password")
+patch_sshd_config() {
+  local cfg
+  local auth_method="${1?}"
+
+  if [[ "$auth_method" == "--reset" ]]
+  then
+    if [[ -f "${SSHD_CONFIG_PATH}.backup" ]]
+    then
+      echo "Restoring '${SSHD_CONFIG_PATH}' from '${SSHD_CONFIG_PATH}.backup'..."
+      mv "${SSHD_CONFIG_PATH}.backup" "${SSHD_CONFIG_PATH}" || return 1
+      return 0
+    else
+      echo "ERROR: Could not restore '${SSHD_CONFIG_PATH}' from '${SSHD_CONFIG_PATH}.backup' (not found)!"
+      return 1
+    fi
+  fi
+
+  # backup sshd_config
+  mkdir -p /etc/pam.backup
+  [[ -f "${SSHD_CONFIG_PATH}.backup" ]] || {
+    echo "Backing up '${SSHD_CONFIG_PATH}'..."
+    cp "$SSHD_CONFIG_PATH" "${SSHD_CONFIG_PATH}.backup"
+  } || {
+    echo "Error creating backup. '${PAMD_PATH}/sshd will remain unchanged!"
+    return 1
+  }
+
+  # get sshd_config without google_authenticator
+  cfg="$(
+    grep -v -e "AuthenticationMethods" "${SSHD_CONFIG_PATH}.backup" |
+      grep -v -e "ChallengeResponseAuthentication" |
+      grep -v -e "PasswordAuthentication" |
+      grep -v -e "PubkeyAuthentication" |
+      grep -v -e "UsePAM"
+  )"
+
+  echo "Writing sshd configuration..."
+  echo "$cfg" > "$SSHD_CONFIG_PATH" || return 1
+  cat << EOF >> "$SSHD_CONFIG_PATH"
+
+###################################
+
+PasswordAuthentication yes
+PubkeyAuthentication yes
+ChallengeResponseAuthentication yes
+UsePAM $enable_totp_and_pw
+AuthenticationMethods $auth_method
+
+EOF
+
+}
+
+setup_configuration() {
+  local auth_method=""
+
+  [[ "$enable_pubkey_only" == "yes" ]] && auth_method="publickey"
+  [[ "$enable_pw_only" == "yes" ]] && auth_method="${auth_method} password"
+
+  [[ "$enable_totp_and_pw" == "yes" ]] && auth_method="keyboard-interactive"
+  [[ "$enable_pubkey_and_pw" == "yes" ]] && auth_method="${auth_method} publickey,password"
+
+  patch_pam_ssh_config || return 2
+  patch_sshd_config "$auth_method" || return 1
+}
+
+setup_totp_secret() {
+  local ssh_user="${1?}"
+  local ssh_user_home="${2?}"
+
+  [[ "$reset_totp_secret" == "yes" ]] \
+  && [[ -f "$ssh_user_home/.google_authenticator" ]] \
+  && {
+    echo "Deleting google authenticator configuration"
+    su "$ssh_user" -c "chmod u+w '${ssh_user_home}/.google_authenticator'"
+    su "$ssh_user" -c "rm '${ssh_user_home}/.google_authenticator'"
+  }
+
+
+  if [[ "$enable_totp_and_pw" == "yes" ]] && [[ ! -f "${ssh_user_home}/.google_authenticator" ]]
+  then
+    echo "We will now generate TOTP a client secret for your ssh user ('$ssh_user')."
+    echo "Please store the following information in a safe place. Use your secret key to setup your authenticator app."
+    echo ""
+    su "$ssh_user" -c "google-authenticator -tdf -w 1 --no-rate-limit"
+  fi
+}
+
+restore() {
+  local ret=0
+  patch_pam_ssh_config --reset
+  ret=$((ret + $?))
+  patch_sshd_config --reset
+  ret=$((ret + $?))
+  return $ret
+}
+
+check_configuration_is_valid() {
+    if { [[ "$enable_pubkey_and_pw" == "yes" ]] || [[ "$enable_pubkey_only" == "yes" ]]; } && [[ -z "$SSH_PUBLIC_KEY" ]]
+    then
+      echo "ERROR: Public key reliant authentication methods have been enabled, but no publick key has been specified. Aborting..."
+      return 1
+    fi
+
+    if [[ "$enable_totp_and_pw" == "yes" ]] && [[ "$enable_pubkey_and_pw" == "yes" ]]
+    then
+      echo "Due to limitations of the sshd configuration, totp+pw and other authentication methods involving a password can't be enabled at the same time."
+      echo "Aborting..."
+      return 1
+    fi
+}
+
+################################################################
+
+cleanup() {
+  restore
+  [[ -d "${PAMD_BACKUP_PATH}" ]] && rm -r "${PAMD_BACKUP_PATH}"
+}
+
+install() {
+  apt install -y libpam-google-authenticator
+}
+
+is_active() {
+  grep -q -e "AuthenticationMethods.*keyboard-interactive" -e "AuthenticationMethods.*publickey" "${SSHD_CONFIG_PATH}" \
+  || grep -q -e "sshd-mfa" "${PAMD_PATH}/sshd"
+}
+
+configure() {
+
+  local active enable_totp_and_pw enable_pubkey_and_pw enable_pubkey_only enable_pw_only reset_totp_secret ssh_pubkeys
+  enable_totp_and_pw="$ENABLE_TOTP_AND_PASSWORD"
+  enable_pubkey_and_pw="$ENABLE_PUBLIC_KEY_AND_PASSWORD"
+  enable_pubkey_only="$ENABLE_PUBLIC_KEY_ONLY"
+  enable_pw_only="$ENABLE_PASSWORD_ONLY"
+  reset_totp_secret="$RESET_TOTP_SECRET"
+  active="yes"
+  ssh_pubkeys=("$(unescape "$SSH_PUBLIC_KEY_1")" \
+               "$(unescape "$SSH_PUBLIC_KEY_2")" \
+               "$(unescape "$SSH_PUBLIC_KEY_3")" \
+               "$(unescape "$SSH_PUBLIC_KEY_4")" \
+               "$(unescape "$SSH_PUBLIC_KEY_5")")
+
+  trap 'restore' HUP INT QUIT PIPE TERM
+
+  if [[ -f "/usr/local/etc/ncp-config.d/SSH.cfg" ]]
+  then
+    # TODO: Should we rather provider an input field for the SSH user (what happens if it is changed in the ssh config)?
+    SSH_USER="$(jq -r '.params[] | select(.id == "USER") | .value' < /usr/local/etc/ncp-config.d/SSH.cfg)"
+    SSH_USER_HOME="$(sudo -Hu "$SSH_USER" bash -c 'echo "$HOME"')"
+  fi
+
+  [[ -n "$SSH_USER" ]] || id -u "$SSH_USER" > /dev/null || {
+    echo "Setup incomplete. Please configure SSH via the ncp app and rerun."
+    return 1
+  }
+
+  [[ "$enable_totp_and_pw" == "no" ]] && [[ "$enable_pubkey_and_pw" == "no" ]] \
+  && [[ "$enable_pubkey_only" == "no" ]] && [[ "$enable_pw_only" == "yes" ]] && {
+    echo "Default configuration has been detected. Restoring defaults..."
+    active="no"
+  }
+
+  if [[ "$active" == "yes" ]] && [[ "$enable_totp_and_pw" != "yes" ]] \
+  && [[ "$enable_pubkey_and_pw" != "yes" ]] && [[ "$enable_pubkey_only" != "yes" ]]
+  then
+    [[ $enable_pw_only ]] \
+    || echo "WARNING: No authentication method has been enabled. Enabling default authentication (password only)..."
+    active="no"
+  fi
+
+  if [[ "$active" != "yes" ]]
+  then
+    ret=0
+    is_active && { restore || ret=$?; }
+    systemctl is-enabled ssh -q && systemctl restart ssh
+    return $ret
+  else
+
+    check_configuration_is_valid || return 3
+
+    if [[ "$enable_totp_and_pw" == "yes" ]] || [[ "$enable_pubkey_and_pw" == "yes" ]]
+    then
+      echo "At least one multifactor authentication method has been enabled. Therefore, weaker authentication methods will be disabled automatically."
+      [[ "$enable_pubkey_only" == "yes" ]] && {
+        echo "Disabling 'public key only' authentication"
+        enable_pubkey_only=no
+      }
+      [[ "$enable_pw_only" == "yes" ]] && {
+        echo "Disabling 'password only' authentication"
+        enable_pw_only=no
+      }
+    fi
+  fi
+
+  echo "Setting up configuration files..."
+  setup_configuration || {
+    ret=$?
+    restore
+    return $ret
+  }
+
+  echo "Restarting ssh service..."
+  systemctl is-enabled ssh -q && systemctl restart ssh
+
+  # Setup SSH public key
+  if [[ -n "${ssh_pubkeys[*]}" ]]
+  then
+    echo "Setting up SSH public key..."
+    local IFS_BK="$IFS"
+    IFS=$'\n'
+    echo "${ssh_pubkeys[*]}" > "${SSH_USER_HOME}/.ssh/authorized_keys"
+    IFS="$IFS_BK"
+    chown "${SSH_USER}:" "${SSH_USER_HOME}/.ssh/authorized_keys"
+  elif [[ -f "${SSH_USER_HOME}/.ssh/authorized_keys" ]]
+  then
+    echo "Removing authorized ssh public key"
+    rm "${SSH_USER_HOME}/.ssh/authorized_keys"
+  fi
+
+  setup_totp_secret "$SSH_USER" "$SSH_USER_HOME"
+
+  echo "Done."
+
+}
diff --git a/etc/library.sh b/etc/library.sh
index 461b2e5b0..abb93ee41 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -73,8 +73,13 @@ function configure_app()
       $DIALOG_OK)
         while read val; do local ret_vals+=("$val"); done <<<"$value"
 
+        local allow_unsafe
+
         for (( i = 0 ; i < len ; i++ )); do
           # check for invalid characters
+          # check if unsafe characters (spaces) are allowed (will return 'null' if key not found)
+          allow_unsafe="$(jq -r .params[$i].allow_unsafe <<<"$cfg")"
+          [[ "${allow_unsafe}" == 'true' ]] && ret_vals[$i]="${ret_vals[$i]// /%SPACE%}"
           grep -q '[\\&#;'"'"'`|*?~<>^"()[{}$&[:space:]]' <<< "${ret_vals[$i]}" && { echo "Invalid characters in field ${vars[$i]}"; return 1; }
 
           cfg="$(jq ".params[$i].value = \"${ret_vals[$i]}\"" <<<"$cfg")"
@@ -279,6 +284,13 @@ function check_distro()
   return 1
 }
 
+
+function unescape()
+{
+  local str="${1?}"
+  echo "${str//"%SPACE%"/" "}"
+}
+
 function clear_password_fields()
 {
   local cfg_file="$1"
@@ -291,6 +303,7 @@ function clear_password_fields()
     cfg="$(jq -r ".params[$i].value=\"$val\"" <<<"$cfg")"
   done
   echo "$cfg" > "$cfg_file"
+
 }
 
 function apt_install()
diff --git a/etc/ncp-config.d/multi-factor-authentication.cfg b/etc/ncp-config.d/multi-factor-authentication.cfg
new file mode 100644
index 000000000..d8a87784c
--- /dev/null
+++ b/etc/ncp-config.d/multi-factor-authentication.cfg
@@ -0,0 +1,75 @@
+{
+  "id": "multi-factor-authentication",
+  "name": "Activate multi factory authentication for SSH login",
+  "title": "Multi-Factor-Authentication",
+  "description": "Choose the authentication method for SSH login.",
+  "info": "The default method is 'password only'.\nPlease note that single factor authentication methods can not be enabled at the same time as multi factor authentication methods.\nThe TOTP authentication requires a compatible app to be used, e.g. FreeOTP, Keepass2Android, Google Authenticator or Authy.\nIf you enable multiple options, they will act as alternatives.",
+  "infotitle": "MFA notes",
+  "params": [
+    {
+      "id": "ENABLE_PASSWORD_ONLY",
+      "name": "enable-password-only",
+      "value": "yes",
+      "type": "bool"
+    },
+    {
+      "id": "ENABLE_PUBLIC_KEY_ONLY",
+      "name": "enable-public-key-only",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "ENABLE_PUBLIC_KEY_AND_PASSWORD",
+      "name": "enable-public-key-plus-password",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "ENABLE_TOTP_AND_PASSWORD",
+      "name": "enable-TOTP-plus-password",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "RESET_TOTP_SECRET",
+      "name": "reset-TOTP-secret",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "SSH_PUBLIC_KEY_1",
+      "name": "SSH Public Key 1",
+      "value": "",
+      "suggest": "Paste your public key here",
+      "allow_unsafe": "true"
+    },
+    {
+    "id": "SSH_PUBLIC_KEY_2",
+    "name": "SSH Public Key 2",
+    "value": "",
+    "suggest": "Paste your public key here",
+    "allow_unsafe": "true"
+    },
+    {
+    "id": "SSH_PUBLIC_KEY_3",
+    "name": "SSH Public Key 3",
+    "value": "",
+    "suggest": "Paste your public key here",
+    "allow_unsafe": "true"
+    },
+    {
+    "id": "SSH_PUBLIC_KEY_4",
+    "name": "SSH Public Key 4",
+    "value": "",
+    "suggest": "Paste your public key here",
+    "allow_unsafe": "true"
+    },
+    {
+    "id": "SSH_PUBLIC_KEY_5",
+    "name": "SSH Public Key 5",
+    "value": "",
+    "suggest": "Paste your public key here",
+    "allow_unsafe": "true"
+    }
+  ]
+}
diff --git a/ncp-web/elements.php b/ncp-web/elements.php
index 8d67fc17e..67633d11c 100644
--- a/ncp-web/elements.php
+++ b/ncp-web/elements.php
@@ -24,6 +24,8 @@ function print_config_form( $ncp_app, $cfg, $l )
     $ret .= "<td><label for=\"$ncp_app-$param[id]\">$param[name]</label></td>";
 
     $value = $param['value'];
+    if (array_key_exists('allow_unsafe', $param) && $param['allow_unsafe'] == "true")
+        $value = str_replace("%SPACE%", " ", $value);
     if ( $value == '_')
       $value = '';
 
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
index c7d26ae06..906cb073a 100644
--- a/ncp-web/ncp-launcher.php
+++ b/ncp-web/ncp-launcher.php
@@ -66,6 +66,8 @@
 
       // sanitize
       $val = trim(escapeshellarg($new_params[$id]),"'");
+      if (array_key_exists('allow_unsafe', $cfg['params'][$index]) && $cfg['params'][$index]['allow_unsafe'] == "true")
+        $val = str_replace(" ", "%SPACE%", $val);
       preg_match( '/[\'" ]/' , $val , $matches )
         and exit( '{ "output": "Invalid parameters" , "token": "' . getCSRFToken() . '" }' );