diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 5352c52..b214268 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
 <!-- Hi, you are about to open a new issue. -->
+<!-- For any output requested below, you may alternatively post it on http://pastebin.com and provide the pastebin url in it's place -->
 # PiVPN Issue Template
 <!-- If the install failed: can you please copy-paste the console output after running `curl install.pivpn.io | bash` between the backticks -->
 ## Console output of `curl install.pivpn.io | bash`
diff --git a/auto_install/install.sh b/auto_install/install.sh
index a7f14ab..69e2826 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -12,6 +12,8 @@
 
 
 ######## VARIABLES #########
+tmpLog=/tmp/pivpn-install.log
+instalLogLoc=/etc/pivpn/install.log
 
 pivpnGitUrl="https://github.com/pivpn/pivpn.git"
 pivpnFilesDir="/etc/.pivpn"
@@ -1033,8 +1035,10 @@ chooseUser
 unattendedUpgrades
 
 # Install
-installPiVPN
+installPiVPN | tee ${tmpLog}
 
+# Move the install log into /etc/pivpn for storage
+$SUDO mv ${tmpLog} ${instalLogLoc}
 
 displayFinalMessage
 
diff --git a/pivpn b/pivpn
index e93367e..01657e8 100644
--- a/pivpn
+++ b/pivpn
@@ -22,7 +22,12 @@ function listOVPNFunc {
 }
 
 function debugFunc {
-    $SUDO /opt/pivpn/pivpnDebug.sh
+    echo "::: Generating Debug Output"
+    $SUDO /opt/pivpn/pivpnDebug.sh | tee /tmp/debug.txt
+    echo "::: "
+    echo "::: Debug output completed above."
+    echo "::: Copy saved to /tmp/debug.txt"
+    echo "::: "
     exit 1
 }