diff --git a/member.pl b/member.pl
index ace4d02790..f042763048 100755
--- a/member.pl
+++ b/member.pl
@@ -29,8 +29,10 @@ use HTML::Template;
 
 my $input = new CGI;
 
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+my $theme = $input->param('theme') || "default";
+			# only used if allowthemeoverride is set
 my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+	# FIXME - Error-checking
 my $template = HTML::Template->new( filename => $tmpldata{'path'}, 
 				    die_on_bad_params => 0,
 				    loop_context_vars => 1 );