diff --git a/content/forum/forummovelinks.js b/content/forum/forummovelinks.js
index 4cbf7e0494..c2a722d492 100644
--- a/content/forum/forummovelinks.js
+++ b/content/forum/forummovelinks.js
@@ -90,7 +90,7 @@ var FoxtrickMoveLinks = {
 				cfHeader.childNodes[0].insertBefore(space,authorLink.nextSibling);
 			}
 			// If avatar is also hidden, change class of message
-			if(Foxtrick.isModuleEnabled( FoxtrickHideManagerAvatar.MODULE_NAME )) {
+			if(Foxtrick.isModuleEnabled( FoxtrickHideManagerAvatar )) {
 				elems = doc.getElementsByTagName("div");
 				for(var k=0; k < elems.length; k++) {
 					if(elems[k].getAttribute("class")=="cfUser") {
diff --git a/content/foxtrick.js b/content/foxtrick.js
index 197c8cc1f8..8e1d29931b 100644
--- a/content/foxtrick.js
+++ b/content/foxtrick.js
@@ -40,7 +40,7 @@ var FoxtrickMain = {
             var module = Foxtrick.modules[i];
             // if module has an init() function and is enabled
             if ( module.MODULE_NAME
-                    && Foxtrick.isModuleEnabled( module.MODULE_NAME )
+                    && Foxtrick.isModuleEnabled( module )
                     && module.init )
             {
                 try {
@@ -233,9 +233,10 @@ String.prototype.group = function( chr, size )
 	return this.split( '' ).reverse().join( '' ).replace( new RegExp( "(.{" + size + "})(?!$)", "g" ), "$1" + chr ).split( '' ).reverse().join( '' );
 }
 
-Foxtrick.isModuleEnabled = function( module_name ) {
+Foxtrick.isModuleEnabled = function( module ) {
     try {
-        return FoxtrickPrefs.getBool( "module." + module_name + ".enabled" );
+        var val = FoxtrickPrefs.getBool( "module." + module.MODULE_NAME + ".enabled" );
+        return (val != null) ? val : module.DEFAULT_ENABLED; 
     } catch( e ) {
         return false;
     }