diff --git a/application/controllers/shared/Users.php b/application/controllers/shared/Users.php
index 18eb592..67c9254 100644
--- a/application/controllers/shared/Users.php
+++ b/application/controllers/shared/Users.php
@@ -320,14 +320,35 @@ class Users extends MY_Controller{
 		$this->Users_model->update_record(array('wachtwoord'=>$saltedww),$userid);
 		$data = array('username'=>$user->gnaam, 'password'=>$ww, 'fullname'=>$this->Users_model->get_fullname($userid));
 
-		$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/newpassword_mail', $data, TRUE));
-		$this->email->bcc("rfranke@framework-ed.nl");
-		$this->email->send();
+		$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
+		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'] );
+			$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [
+				'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']
+				]
+			] );
+		}else
+		{
+			$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( $html );
+			$this->email->bcc( "rfranke@framework-ed.nl" );
+			$this->email->send();
+		}
 
 		echo json_encode(array('ok'=>$ok, 'errortekst'=>$errortekst));
 	}