diff --git a/app/config/core.php b/app/config/core.php
index 05f11743..0bac275d 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -52,8 +52,8 @@ if($host == 'cmc.lan') {
 	$basedir = '/var/www/CMC-Sales/app';
 	Configure::write('email_directory', '/var/www/cakephp/app/emails');
 
-	Configure::write('pdf_directory', '/var/www/cakephp/app/webroot/pdf/');
-	Configure::write('attachments_directory', '/var/www/cakephp/app/webroot/attachments_files/');
+	Configure::write('pdf_directory', $basedir.'/webroot/pdf/');
+	Configure::write('attachments_directory', $basedir.'/attachments_files/');
 
 	Configure::write('smtp_settings', array(
 		'port' => '25',
@@ -285,4 +285,4 @@ Configure::write('Acl.database', 'default');
  *	));
  *
  */
-?>
+
diff --git a/app/views/elements/pdf_output.ctp b/app/views/elements/pdf_output.ctp
index c482abdb..a3e0ba31 100755
--- a/app/views/elements/pdf_output.ctp
+++ b/app/views/elements/pdf_output.ctp
@@ -1,9 +1,4 @@
 <?
-$debuglevel = Configure::read('debug');
-if($debuglevel == 0) {
-    $output_dir = '/var/www/cakephp/app/webroot/pdf/';
-}
-
 
 $output_dir = Configure::read('pdf_directory');
 
@@ -16,4 +11,4 @@ for ($i = 1; $i <= $pagecount; $i++) { //Not really necessary for a 1 page T&C P
 
 $pdfdoc->lastPage();
 $pdfdoc->Output($output_dir.$filename, "F");
-?>
\ No newline at end of file
+?>