diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 78c7f3a1..0f8804ff 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -528,8 +528,8 @@ class Lotw extends CI_Controller {
 				$file = $config['upload_path'] . 'lotwreport_download.adi';
 
 				// Get credentials for LoTW
-		    	$data['user_lotw_name'] = rawurlencode($user->user_lotw_name);
-				$data['user_lotw_password'] = rawurlencode($user->user_lotw_password);
+		    	$data['user_lotw_name'] = urlencode($user->user_lotw_name);
+				$data['user_lotw_password'] = urlencode($user->user_lotw_password);
 
 				// Get URL for downloading LoTW
 				$query = $query = $this->db->query('SELECT lotw_download_url FROM config');
@@ -587,8 +587,8 @@ class Lotw extends CI_Controller {
 			// Get credentials for LoTW
 			$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
     	    $q = $query->row();
-    	    $data['user_lotw_name'] = rawurlencode($q->user_lotw_name);
-			$data['user_lotw_password'] = rawurlencode($q->user_lotw_password);
+    	    $data['user_lotw_name'] = urlencode($q->user_lotw_name);
+			$data['user_lotw_password'] = urlencode($q->user_lotw_password);
 
 			// Get URL for downloading LoTW
 			$query = $query = $this->db->query('SELECT lotw_download_url FROM config');