diff --git a/crates/core/src/database/posts.rs b/crates/core/src/database/posts.rs
index f2bddad..4740f19 100644
--- a/crates/core/src/database/posts.rs
+++ b/crates/core/src/database/posts.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-
 use super::*;
 use crate::cache::Cache;
 use crate::model::auth::Notification;
diff --git a/crates/core/src/model/auth.rs b/crates/core/src/model/auth.rs
index b4831a5..89880ae 100644
--- a/crates/core/src/model/auth.rs
+++ b/crates/core/src/model/auth.rs
@@ -320,7 +320,7 @@ impl User {
             }
 
             if at {
-                if (char == ' ') && !escape {
+                if char == ' ' {
                     // reached space, end @
                     at = false;
 
@@ -339,6 +339,10 @@ impl User {
             escape = false;
         }
 
+        if !buffer.is_empty() {
+            out.push(buffer);
+        }
+
         // return
         out
     }