diff --git a/buttsbot.go b/buttsbot.go
index 78a14a4..eee62a0 100644
--- a/buttsbot.go
+++ b/buttsbot.go
@@ -12,11 +12,15 @@ import (
 
 var Session, _ = discordgo.New()
 var testPtr = flag.Bool("test", false, "Test mode")
+var bot_token string
 
 func init() {
-	Session.Token = os.Getenv("DISCORD_TOKEN")
-	if Session.Token == "" {
-		flag.StringVar(&Session.Token, "t", "", "Discord Authentication Token")
+	if os.Getenv("DISCORD_TOKEN") != "" {
+		Session.Token = "Bot " + os.Getenv("DISCORD_TOKEN")
+	} else {
+		flag.StringVar(&bot_token, "t", "", "Discord Authentication Token")
+		flag.Parse()
+		Session.Token = "Bot " + bot_token
 	}
 }