diff --git a/modules/invoice/classes/Task/Invoice/Reminddue.php b/modules/invoice/classes/Task/Invoice/Reminddue.php
index eb40fe6f..fe649fc6 100644
--- a/modules/invoice/classes/Task/Invoice/Reminddue.php
+++ b/modules/invoice/classes/Task/Invoice/Reminddue.php
@@ -23,7 +23,7 @@ class Task_Invoice_Reminddue extends Minion_Task {
 
 			// Generate a token to view the invoice online
 			$token = ORM::factory('Module_Method_Token')
-				->method(array('invoice','user_view'))
+				->method(array('invoice','user:view'))
 				->account($io->account)
 				->expire(time()+86400*21)
 				->uses(3)
diff --git a/modules/ssl/classes/SSL.php b/modules/ssl/classes/SSL.php
index 41bf218a..8e184667 100644
--- a/modules/ssl/classes/SSL.php
+++ b/modules/ssl/classes/SSL.php
@@ -162,6 +162,9 @@ class SSL {
 	}
 
 	public function get_issuer() {
+		if ($this->get_isRoot())
+			return '-';
+
 		$k = $this->_details('issuer');
 
 		return isset($k['CN']) ? $k['CN'] : '';
diff --git a/modules/ssl/views/service/user/plugin/ssl/view/certificate.php b/modules/ssl/views/service/user/plugin/ssl/view/certificate.php
index 7f56468a..a83eb17f 100644
--- a/modules/ssl/views/service/user/plugin/ssl/view/certificate.php
+++ b/modules/ssl/views/service/user/plugin/ssl/view/certificate.php
@@ -5,7 +5,7 @@
 
 	<?php
 		echo $o->download_button(); 
-		if ($ao=Auth::instance()->get_user() AND ($ao->isAdmin() OR $ao->isReseller()) AND $o->service->status AND ($o->valid_to()-(Kohana::$config->load('ssl.min_renew_days')*86400) <= time()) AND $o->service->paid_to() > time()) :
+		if ($ao=Auth::instance()->get_user() AND ($ao->isAdmin() OR $ao->isReseller()) AND $o->service->active AND ($o->valid_to()-(Kohana::$config->load('ssl.min_renew_days')*86400) <= time()) AND $o->service->paid_to() > time()) :
 			echo Form::open(URL::link('reseller','ssl/renew/'.$o->service->id));
 			echo Form::button('submit','Renew',array('class'=>'btn btn-primary','nocg'=>TRUE));
 		else : ?>