diff --git a/bin/ncp/CONFIG/nc-passwd.sh b/bin/ncp/CONFIG/nc-passwd.sh
index e015117da..2f85b53fc 100644
--- a/bin/ncp/CONFIG/nc-passwd.sh
+++ b/bin/ncp/CONFIG/nc-passwd.sh
@@ -29,6 +29,7 @@ configure()
     a2dissite ncp-activation
     a2ensite  ncp 001-nextcloud
     apachectl -k graceful
+    sed -i -e 's/^NCP is not activated yet.*$//' /etc/issue
 
     # Trusted Domain (local/public IP), also configures notify_push
     bash /usr/local/bin/nextcloud-domain.sh
diff --git a/ncp.sh b/ncp.sh
index 09552377b..9b110a143 100644
--- a/ncp.sh
+++ b/ncp.sh
@@ -244,6 +244,9 @@ EOF
 #!/bin/bash
 /usr/local/bin/ncp-check-updates
 EOF
+
+    echo '
+NCP is not activated yet. Please enter this instances local IP address in your webbrowser to complete activation.' >> /etc/issue
     chmod a+x /etc/update-motd.d/*
 
     ## HOSTNAME AND mDNS