diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index fab3b47..087d0a7 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,7 +14,7 @@ import java.util.Date;
  */
 public final class ReleaseInfo {
 	private final static String buildmeta = "002";
-	private final static Date date = new Date(1467486806272L);
+	private final static Date date = new Date(1467518031071L);
 	private final static int major = 0;
 	private final static int minor = 7;
 	private final static int patch = 0;
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index e518442..4be0165 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -74,9 +74,15 @@ final public class Twitter extends AbstractModule
 	@Override
 	public boolean isEnabled()
 	{
-		return Utils.isValidString(properties.get(CONSUMER_KEY_PROP)) && Utils
-				.isValidString(properties.get(CONSUMER_SECRET_PROP)) && Utils.isValidString(properties.get(TOKEN_PROP))
-		       && Utils.isValidString(properties.get(TOKEN_SECRET_PROP));
+		for (final String s : getPropertyKeys())
+		{
+			if (!Utils.isValidString(properties.get(s)))
+			{
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	@Override