diff --git a/bot/bot.go b/bot/bot.go
index 1e54b6b..7736d9a 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -38,8 +38,8 @@ func (bot *Bot) Start() error {
 		Server:      bot.config.Server,
 		Port:        bot.config.Port,
 		Nick:        bot.config.Nick,
-		User:        bot.config.Nick + "_user",
-		Name:        bot.config.Nick + "_name",
+		User:        bot.config.User,
+		Name:        bot.config.Name,
 		RecoverFunc: func(_ *girc.Client, e *girc.HandlerError) { bot.log.Errorln(e.Error()) },
 	}
 	if bot.config.SASLUser != "" && bot.config.SASLPass != "" {
diff --git a/config.toml b/config.toml
index bb72748..da9933a 100644
--- a/config.toml
+++ b/config.toml
@@ -1,5 +1,5 @@
 # IRC
-nick = "oodle-devvvv"
+nick = "oodle-dev"
 name = "oodle-dev"
 user = "oodle-dev"
 sasl_user = ""
diff --git a/oodle/config.go b/oodle/config.go
index 092bd1b..fbda9d4 100644
--- a/oodle/config.go
+++ b/oodle/config.go
@@ -2,6 +2,8 @@ package oodle
 
 type Config struct {
 	Nick     string `toml:"nick"`
+	Name     string `toml:"name"`
+	User     string `toml:"user"`
 	Server   string `toml:"server"`
 	Port     int    `toml:"port"`
 	Channel  string `toml:"channel"`