Index: win_installer/src/backup-finish.ini
===================================================================
diff -u
--- win_installer/src/backup-finish.ini	(revision 0)
+++ win_installer/src/backup-finish.ini	(revision fcdb2895e76542f323a014ddedb92592745272ef)
@@ -0,0 +1,9 @@
+[Settings]
+NumFields=1
+
+[Field 1]
+Type=Label
+Left=12
+Top=18
+Right=288
+Bottom=127
Index: win_installer/src/backup.ini
===================================================================
diff -u -rbda7def73cd2f11ef2e6ff2f3cc999aac6704fff -rfcdb2895e76542f323a014ddedb92592745272ef
--- win_installer/src/backup.ini	(.../backup.ini)	(revision bda7def73cd2f11ef2e6ff2f3cc999aac6704fff)
+++ win_installer/src/backup.ini	(.../backup.ini)	(revision fcdb2895e76542f323a014ddedb92592745272ef)
@@ -1,20 +1,28 @@
 [Settings]
-NumFields=2
+NumFields=3
 CancelShow=0
 BackEnabled=0
 NextButtonText=Run Backup
 
 [Field 1]
 Type=DirRequest
-Left=69
-Top=62
-Right=219
-Bottom=72
+Left=67
+Top=93
+Right=284
+Bottom=103
 
 [Field 2]
 Type=Label
-Left=69
-Top=38
-Right=229
-Bottom=63
-Text=Please enter or browse for a location to backup your LAMS directory\r\n\r\nl
+Left=6
+Top=94
+Right=72
+Bottom=102
+Text=Backup Directory:\r\n\r\nl
+
+[Field 3]
+Type=Label
+Left=6
+Top=12
+Right=291
+Bottom=94
+Text="Welcome to the LAMS 2 Backup Utility.\r\n\r\nThis utility will back up your entire LAMS 2 installation and your LAMS database to the directory you specify below.\r\n\r\nYou can restore your installation later by following the instructions at:\r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Updater+Backup\r\n"
Index: win_installer/src/backup.nsi
===================================================================
diff -u -rbda7def73cd2f11ef2e6ff2f3cc999aac6704fff -rfcdb2895e76542f323a014ddedb92592745272ef
--- win_installer/src/backup.nsi	(.../backup.nsi)	(revision bda7def73cd2f11ef2e6ff2f3cc999aac6704fff)
+++ win_installer/src/backup.nsi	(.../backup.nsi)	(revision fcdb2895e76542f323a014ddedb92592745272ef)
@@ -46,13 +46,19 @@
 VIAddVersionKey FileDescription ""
 VIAddVersionKey LegalCopyright ""
 
-!define MUI_FINISHPAGE_TEXT "LAMS has been successfully backed up on your computer" 
 
+
 # set warning when cancelling install
 !define MUI_ABORTWARNING
 Page custom PreBackupDir PostBackupDir
+!define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "LAMS backup complete"
+!define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT ""
 !insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
+Page custom PreFinish PostFinish
+
+;!define MUI_FINISHPAGE_TEXT "LAMS has been successfully backed up on your computer" 
+;!insertmacro MUI_PAGE_FINISH
+
 !insertmacro MUI_LANGUAGE "English"
 
 
@@ -66,6 +72,7 @@
 
 
 ReserveFile "backup.ini"
+ReserveFile "backup-finish.ini"
 
 
 Section backup
@@ -77,7 +84,7 @@
     DetailPrint "Backing up lams at: $BACKUP_DIR. This may take a few minutes"
     SetDetailsPrint listonly
     createdirectory $BACKUP_DIR
-    copyfiles /SILENT $INSTDIR $BACKUP_DIR
+    copyfiles /SILENT "$INSTDIR\*" $BACKUP_DIR
     SetDetailsPrint both
     iferrors error1 continue1
     error1:
@@ -109,6 +116,12 @@
 
 Function .onInit
     ReadRegStr $INSTDIR HKLM "${REG_HEAD}" "dir_inst"
+    
+    ${if} $INSTDIR == ""
+        MessageBox MB_OK|MB_ICONEXCLAMATION "You do not have LAMS 2 installed"
+        Abort
+    ${endif}
+    
     ReadRegStr $DB_NAME HKLM "${REG_HEAD}" "db_name"
     ReadRegStr $DB_USER HKLM "${REG_HEAD}" "db_user"
     ReadRegStr $DB_PASS HKLM "${REG_HEAD}" "db_pass"
@@ -148,11 +161,12 @@
     strcpy $BACKUP_DIR "$INSTDIR-$2$1$0$4$5.bak"
    
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "backup.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "backup-finish.ini"
 FunctionEnd
 
 Function PreBackupDir
     !insertmacro MUI_INSTALLOPTIONS_WRITE "backup.ini" "Field 1" "State" "$BACKUP_DIR"
-    !insertmacro MUI_HEADER_TEXT "LAMS Backup Dir" "Enter a directory in the space provided"
+    !insertmacro MUI_HEADER_TEXT "LAMS Backup Utility" "Enter a directory in the space provided to back up your LAMS installation"
     !insertmacro MUI_INSTALLOPTIONS_DISPLAY "backup.ini"
 FunctionEnd
 
@@ -172,6 +186,16 @@
     continue:
 FunctionEnd
 
+Function PreFinish
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "backup-finish.ini" "Field 1" "Text" "Congratulations! \r\n\r\nLAMS has backed successfully backed up to: $BACKUP_DIR \r\n\r\n\r\n\r\nTo revert to the backup, follow the instructions listed at: \r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Updater+Backup"
+    !insertmacro MUI_HEADER_TEXT "LAMS Backup Utility" "Your LAMS backup is complete"
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "backup-finish.ini"
+FunctionEnd
+
+Function PostFinish
+    ; DO NOTHING!
+FunctionEnd
+
 Function CheckMySQL    
     # Checking if the given database name already exists in the mysql database list
     ifFileExists "$MYSQL_DIR\data\$DB_NAME\*.*" continue NoDatabaseNameExists