diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index 08fb9d2fb7..dd3de05b00 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -45,7 +45,6 @@
 		});
 		socket.emit('api:user.get', { fields: ['username', 'picture'] });
 		socket.on('api:user.get', function(data) {
-			console.log(data);
 			if (data.uid > 0) {
 				var	gravatar = document.createElement('img'),
 					name = document.createElement('span')
diff --git a/public/templates/login.tpl b/public/templates/login.tpl
index 8cf6aca923..d2f06bef2b 100644
--- a/public/templates/login.tpl
+++ b/public/templates/login.tpl
@@ -9,9 +9,8 @@
 		<form method="post" action="/login">
 			<label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br />
 			<label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br />
-			<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp;
+			<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a>
 		</form>
-		<a href="/reset">Forgot Password?</a>
 	</div>
 	<div class="well span6">
 		<h4>Alternative Logins</h4>
diff --git a/src/webserver.js b/src/webserver.js
index 586c462a9c..95d55d9d29 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -8,7 +8,8 @@ var express = require('express'),
 	redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
 	passport = require('passport'),
 	passportLocal = require('passport-local').Strategy,
-	passportTwitter = require('passport-twitter').Strategy;
+	passportTwitter = require('passport-twitter').Strategy,
+	login_strategies = [];
 
 passport.use(new passportLocal(function(user, password, next) {
 	global.modules.user.loginViaLocal(user, password, function(login) {
@@ -17,16 +18,20 @@ passport.use(new passportLocal(function(user, password, next) {
 	});
 }));
 
-passport.use(new passportTwitter({
-	consumerKey: config.twitter.key,
-	consumerSecret: config.twitter.secret,
-	callbackURL: config.url + "auth/twitter/callback"
-}, function(token, tokenSecret, profile, done) {
-	global.modules.user.loginViaTwitter(profile.id, profile.username, function(err, user) {
-		if (err) { return done(err); }
-		done(null, user);
-	});
-}));
+if (config.twitter.key.length > 0 && config.twitter.secret.length > 0) {
+	passport.use(new passportTwitter({
+		consumerKey: config.twitter.key,
+		consumerSecret: config.twitter.secret,
+		callbackURL: config.url + "auth/twitter/callback"
+	}, function(token, tokenSecret, profile, done) {
+		global.modules.user.loginViaTwitter(profile.id, profile.username, function(err, user) {
+			if (err) { return done(err); }
+			done(null, user);
+		});
+	}));
+
+	login_strategies.push('twitter');
+}
 
 passport.serializeUser(function(user, done) {
 	done(null, user.uid);
@@ -147,12 +152,14 @@ passport.deserializeUser(function(uid, done) {
 		});
 	});
 
-	app.get('/auth/twitter', passport.authenticate('twitter'));
+	if (login_strategies.indexOf('twitter') !== -1) {
+		app.get('/auth/twitter', passport.authenticate('twitter'));
 
-	app.get('/auth/twitter/callback', passport.authenticate('twitter', {
-		successRedirect: '/',
-		failureRedirect: '/login'
-	}));
+		app.get('/auth/twitter/callback', passport.authenticate('twitter', {
+			successRedirect: '/',
+			failureRedirect: '/login'
+		}));
+	}
 
 	app.get('/reset/:code', function(req, res) {
 		res.send(templates['header'] + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);