diff --git a/tasks.py b/tasks.py
index 7f5402da15758a566af25dd8ddc1e035f111b8f7..6888829bdf9c71b83f9ca653bb43d80cfbb0c3a6 100644
--- a/tasks.py
+++ b/tasks.py
@@ -51,11 +51,12 @@ def celery_create_account(json, session):
     email= json['email']
     fullname= json['fullname']
     reason= json['reason']
+    queuename= rc_util.encode_name(username)
 
     print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
     send_msg('creating account', room)
     print(username)
-    rc_util.add_account(username, email, fullname, reason)
+    rc_util.add_account(username, queuename, email, fullname, reason)
     print('sent account info')
     print('Waiting for completion...')
-    rc_util.consume(username, routing_key=f'complete.{username}', callback=gen_f(room))    
+    rc_util.consume(queuename, routing_key=f'complete.{queuename}', callback=gen_f(room))