diff --git a/application/controllers/Login.php b/application/controllers/Login.php
index cdec8bd..a31b5cc 100644
--- a/application/controllers/Login.php
+++ b/application/controllers/Login.php
@@ -150,31 +150,33 @@ class Login extends MY_Controller {
 			$data = ['username' => $username, 'password' => $password, 'fullname' => $this->Users_model->get_fullname( $userid )];
 
 			$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
+			if( $_ENV['ENVIRONMENT'] == 'development')
+			{
+				//Deze code wordt alleen op produktie gebruikt en stuurt de mail
+				//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
+				$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
+				$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
+					'from'    => 'info@monpas.nl',
+					'to'      => $email,
+					'cc'      => 'rfranke@framework-ed.nl',
+					'subject' => 'Inloggegevens MonPas',
+					'html'    => $html,
+					'inline'  => [
+						[
+							'filename' => 'monpasklein.png',
+							'filePath' =>  FCPATH . 'css/images/monpasklein.png']
+					]
+				] );
+			}else{
+				$this->load->library( 'email' );
 
-//			return;
-//			$this->load->library( 'email' );
-//
-//			$this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' );
-//			$this->email->to( $email );
-//			$this->email->subject( 'Inloggegevens MonPas' );
-//			$this->email->message( $this->load->view( 'emails/newpassword_mail', $data, TRUE ) );
-//			$this->email->bcc( "rfranke@framework-ed.nl" );
-//			$this->email->send();
-
-
-			$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); // For US servers
-			$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
-				'from'    => 'info@monpas.nl',
-				'to'      => $email,
-				'cc'      => 'rfranke@framework-ed.nl',
-				'subject' => 'Inloggegevens MonPas',
-				'html'    => $html,
-				'inline'  => [
-					[
-						'filename' => 'monpasklein.png',
-						'filePath' =>  FCPATH . 'css/images/monpasklein.png']
-				]
-			] );
+				$this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' );
+				$this->email->to( $email );
+				$this->email->subject( 'Inloggegevens MonPas' );
+				$this->email->message( $this->load->view( 'emails/newpassword_mail', $data, TRUE ) );
+				$this->email->bcc( "rfranke@framework-ed.nl" );
+				$this->email->send();
+			}
 
 
 			$result['errortekst'] = 'Er is een e-mail gestuurd naar ' . $email . ' met uw nieuwe wachtwoord.';
diff --git a/application/controllers/shared/Users.php b/application/controllers/shared/Users.php
index acfef25..18eb592 100644
--- a/application/controllers/shared/Users.php
+++ b/application/controllers/shared/Users.php
@@ -163,39 +163,43 @@ class Users extends MY_Controller{
         $org = $this->getBijlage($orgid);
 
 		$html = $this->load->view('emails/newuser_mail', $data, TRUE);
-		$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); // For US servers
-		$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
-			'from'    => 'info@monpas.nl',
-			'to'      => $user->email,
-			'cc'      => 'rfranke@framework-ed.nl',
-			'subject' => 'Inloggegevens MonPas',
-			'html'    => $html,
-			'attachment' => [
-				[
-					'filename' => $org->bijlagefile,
-					'filePath' => MYROOTPATH. 'docs/'.$org->randomname
+
+		if( $_ENV['ENVIRONMENT'] == 'production')
+		{
+			//Deze code wordt alleen op produktie gebruikt en stuurt de mail
+			//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
+			$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
+
+			$mailData = [
+				'from'    => 'info@monpas.nl',
+				'to'      => $user->email,
+				'cc'      => 'rfranke@framework-ed.nl',
+				'subject' => 'Inloggegevens MonPas',
+				'html'    => $html,
+				'inline'  => [
+					[
+						'filename' => 'monpasklein.png',
+						'filePath' =>  FCPATH . 'css/images/monpasklein.png']
 				]
-			],
-			'inline'  => [
-				[
-					'filename' => 'monpasklein.png',
-					'filePath' =>  FCPATH . 'css/images/monpasklein.png']
-				]
-			]
-		);
+			];
 
+			if( $org->randomname ) $mailData['attachment'][0] = [
+				'filename' => $org->bijlagefile,
+				'filePath' => MYROOTPATH. 'docs/'.$org->randomname ];
 
+			$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData );
+		}else{
+			$this->load->library('email');
 
-//        $this->load->library('email');
-//
-//        $this->email->from('noreply@framework.nl', 'Framework+ MonPas');
-//        $this->email->to($user->email);
-//        $this->email->subject('Inloggegevens MonPas');
-//        $this->email->message($this->load->view('emails/newuser_mail', $data, TRUE));
-//        $this->email->bcc("rfranke@framework-ed.nl");
-//        if ($org->randomname)
-//            $this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile);
-//        $this->email->send();
+			$this->email->from('noreply@framework.nl', 'Framework+ MonPas');
+			$this->email->to($user->email);
+			$this->email->subject('Inloggegevens MonPas');
+			$this->email->message($this->load->view('emails/newuser_mail', $data, TRUE));
+			$this->email->bcc("rfranke@framework-ed.nl");
+			if ($org->randomname)
+				$this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile);
+			$this->email->send();
+		}
 	}
 
 	function updateuser2(){