diff --git a/app/policies/token_policy.rb b/app/policies/token_policy.rb
index a571e0a8..97c58c6c 100644
--- a/app/policies/token_policy.rb
+++ b/app/policies/token_policy.rb
@@ -34,11 +34,11 @@ class TokenPolicy
   end
 
   def create?
-    @user.admin? || true
+    @user.admin? || @user.signed_in?
   end
 
   def new?
-    @user.admin? || true
+    @user.admin? || @user.signed_in?
   end
 
   def add_existing?
diff --git a/app/views/layouts/_flashmessages.html.haml b/app/views/layouts/_flashmessages.html.haml
index 6d5e1fb5..0dd5810f 100644
--- a/app/views/layouts/_flashmessages.html.haml
+++ b/app/views/layouts/_flashmessages.html.haml
@@ -1,7 +1,7 @@
 .original_flash_message_code
   - flash.each do |key, value|
     %div{class: "alert alert-#{key}"}
-      = value.html_safe
+      = value.to_s.html_safe
 
 .react_flash_messages
   %div#flash_messages