diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 6ff16c3e9fe831820f705031375e05215530993d..9544f2fa70226184c63e33e5194906a01da19a5e 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -4,7 +4,6 @@ import android.arch.lifecycle.ViewModel
 import de.kuschku.libquassel.protocol.BufferId
 import de.kuschku.libquassel.protocol.Buffer_Type
 import de.kuschku.libquassel.protocol.NetworkId
-import de.kuschku.libquassel.protocol.message.HandshakeMessage
 import de.kuschku.libquassel.quassel.BufferInfo
 import de.kuschku.libquassel.quassel.syncables.BufferViewConfig
 import de.kuschku.libquassel.quassel.syncables.IrcChannel
@@ -247,7 +246,7 @@ class QuasselViewModel : ViewModel() {
                     combineLatest<AutoCompleteItem>(nicks + buffers)
                       .map { list ->
                         val ignoredStartingCharacters = charArrayOf(
-                          '-', '_', '[', ']', '{', '}', '|', '`', '^', '.', '\\'
+                          '-', '_', '[', ']', '{', '}', '|', '`', '^', '.', '\\', '@'
                         )
 
                         Pair(