diff --git a/lib/discord_bot/bot.rb b/lib/discord_bot/bot.rb
index 063e322..0de3f72 100644
--- a/lib/discord_bot/bot.rb
+++ b/lib/discord_bot/bot.rb
@@ -76,11 +76,13 @@ def initialize
       ]
     end
 
-    def run(skip_motd: false)
+    def run(skip_motd: false, fast_boot: false)
       Logger.info 'Initializing bot'
-      pull_default_model
-      delete_unused_commands
-      register_commands
+      unless fast_boot
+        pull_default_model
+        delete_unused_commands
+        register_commands
+      end
       initialize_callbacks
       motd unless skip_motd
       # at_exit { @bot.stop }
@@ -186,7 +188,7 @@ def register_commands
     end
 
     def handle_message(message)
-      Logger.info "Message received (#{message.server.name} \##{message.channel.name}):\n#{message.content}"
+      Logger.info "Message received (#{message.from}):\n#{message.content}"
       if message.content.start_with?('!prompt ')
         set_system_prompt_from_chat(message)
       elsif message.content.include?('(╯°□°)╯︵ ┻━┻')
diff --git a/lib/discord_bot/events/message.rb b/lib/discord_bot/events/message.rb
index 6ac21c1..9c6ed20 100644
--- a/lib/discord_bot/events/message.rb
+++ b/lib/discord_bot/events/message.rb
@@ -17,6 +17,14 @@ def server
         @event.server
       end
 
+      def from
+        if server.present?
+          "#{server.name} \##{channel.name}"
+        else
+          "<@#{user.id}> @#{channel.name} \"#{name}\""
+        end
+      end
+
       def name
         if @event.user.nickname.present?
           @event.user.nickname