Index: /Users/mh/Documents/workspace/SN/lib/SDI/SqueezeNetwork/Controller/User/Account/Pandora.pm
===================================================================
--- /Users/mh/Documents/workspace/SN/lib/SDI/SqueezeNetwork/Controller/User/Account/Pandora.pm	(revision 3076)
+++ /Users/mh/Documents/workspace/SN/lib/SDI/SqueezeNetwork/Controller/User/Account/Pandora.pm	(working copy)
@@ -75,7 +75,15 @@
 	if ( my $expires = $c->stash->{prefs}->{pandora_trial_expires} ) {
 		my $now  = time();
 		my $days = int( ( $expires - $now ) / 86400 );
-		$c->stash->{prefs}->{pandora_trial_expires} = $days;
+
+		if ($days <= 0) {
+			
+			$c->stash->{prefs}->{pandora_trial_expired} = 1;
+		}
+		else {
+			
+			$c->stash->{prefs}->{pandora_trial_expires} = $days;
+		}
 	}
 }	
 
Index: /Users/mh/Documents/workspace/SN/docroot/user/account/pandora.tt
===================================================================
--- /Users/mh/Documents/workspace/SN/docroot/user/account/pandora.tt	(revision 3076)
+++ /Users/mh/Documents/workspace/SN/docroot/user/account/pandora.tt	(working copy)
@@ -47,7 +47,7 @@
 				<td nowrap valign="top">[% "PANDORA_ACCOUNT_STATUS" | string %]:</td>
 				<td>
 					[% IF prefs.pandora_account_type == 'COMPLIMENTARY' %]
-			  			[% IF prefs.pandora_alert_code == 'COMPLIMENTARY_PERIOD_EXPIRED' %]
+			  			[% IF prefs.pandora_alert_code == 'COMPLIMENTARY_PERIOD_EXPIRED' || prefs.pandora_trial_expired %]
 							[% "PANDORA_COMPLIMENTARY_PERIOD_EXPIRED" | string %]
 						[% ELSE %]
 			    			[% "PANDORA_TRIAL_ACCOUNT_ACTIVE" | string %]