diff --git a/resources/resources.qrc b/resources/resources.qrc
index 129713804..c0dc8a917 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -74,7 +74,7 @@
         <file>avatars/pajlada.png</file>
         <file>images/download_update.png</file>
         <file>images/download_update_error.png</file>
-		<file>images/pajaDank.png</file>
+        <file>images/pajaDank.png</file>
     </qresource>
     <qresource prefix="/qt/etc">
         <file>qt.conf</file>
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 595643ccd..505985986 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -172,12 +172,22 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel,
                 channel->addMessage(Message::createSystemMessage(messageText));
 
                 return "";
-            } else if (commandName == "/ignore" && words.size() >= 2) {
+            } else if (commandName == "/ignore") {
+                if (words.size() < 2) {
+                    channel->addMessage(Message::createSystemMessage("Usage: /ignore [user]"));
+                    return "";
+                }
                 auto app = getApp();
 
                 auto user = app->accounts->twitch.getCurrent();
                 auto target = words.at(1);
 
+                if (words.at(1).at(0) == "@") {
+                    target = words.at(1).mid(1);
+                } else {
+                    target = words.at(1);
+                }
+
                 if (user->isAnon()) {
                     channel->addMessage(
                         Message::createSystemMessage("You must be logged in to ignore someone"));
@@ -189,12 +199,22 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel,
                 });
 
                 return "";
-            } else if (commandName == "/unignore" && words.size() >= 2) {
+            } else if (commandName == "/unignore") {
+                if (words.size() < 2) {
+                    channel->addMessage(Message::createSystemMessage("Usage: /unignore [user]"));
+                    return "";
+                }
                 auto app = getApp();
 
                 auto user = app->accounts->twitch.getCurrent();
                 auto target = words.at(1);
 
+                if (words.at(1).at(0) == "@") {
+                    target = words.at(1).mid(1);
+                } else {
+                    target = words.at(1);
+                }
+
                 if (user->isAnon()) {
                     channel->addMessage(
                         Message::createSystemMessage("You must be logged in to ignore someone"));
@@ -216,6 +236,12 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel,
                 auto user = app->accounts->twitch.getCurrent();
                 auto target = words.at(1);
 
+                if (words.at(1).at(0) == "@") {
+                    target = words.at(1).mid(1);
+                } else {
+                    target = words.at(1);
+                }
+
                 if (user->isAnon()) {
                     channel->addMessage(
                         Message::createSystemMessage("You must be logged in to follow someone"));
@@ -245,6 +271,12 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel,
                 auto user = app->accounts->twitch.getCurrent();
                 auto target = words.at(1);
 
+                if (words.at(1).at(0) == "@") {
+                    target = words.at(1).mid(1);
+                } else {
+                    target = words.at(1);
+                }
+
                 if (user->isAnon()) {
                     channel->addMessage(
                         Message::createSystemMessage("You must be logged in to follow someone"));