diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php
index 988404e1..7d6a4344 100644
--- a/application/controllers/Eqsl.php
+++ b/application/controllers/Eqsl.php
@@ -322,7 +322,7 @@ class eqsl extends CI_Controller {
 				$adif .= "%3A";
 				$adif .= strlen($data['user_eqsl_password']);
 				$adif .= "%3E";
-				$adif .= $data['user_eqsl_password'];
+				$adif .= urlencode($data['user_eqsl_password']);
 				$adif .= "%20";
 				
 				$adif .= "%3C";
@@ -583,8 +583,7 @@ class eqsl extends CI_Controller {
 			$username = $q->user_eqsl_name;
 			$password = $q->user_eqsl_password;
 
-
-			$image_url = $this->electronicqsl->card_image($username, $password, $callsign, $band, $mode, $year, $month, $day, $hour, $minute);
+			$image_url = $this->electronicqsl->card_image($username, urlencode($password), $callsign, $band, $mode, $year, $month, $day, $hour, $minute);
 			$file = file_get_contents($image_url, true);
 
 			$dom = new domDocument; 
diff --git a/application/views/eqsl/analysis.php b/application/views/eqsl/analysis.php
index 91956b77..83ac0503 100644
--- a/application/views/eqsl/analysis.php
+++ b/application/views/eqsl/analysis.php
@@ -5,10 +5,10 @@
     <h5 class="card-title"><?php echo $page_title; ?></h5>
     <ul class="nav nav-tabs card-header-tabs">
       <li class="nav-item">
-        <a class="nav-link" href="<?php echo site_url('eqsl/import');?>">Download QSOs</a>
+        <a class="nav-link active" href="<?php echo site_url('eqsl/import');?>">Download QSOs</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link active" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+        <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
       </li>
     </ul>
   </div>