diff --git a/src/mibew/libs/classes/Mibew/Controller/ButtonCodeController.php b/src/mibew/libs/classes/Mibew/Controller/ButtonCodeController.php
index 165800b6..d5a7f5f0 100644
--- a/src/mibew/libs/classes/Mibew/Controller/ButtonCodeController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/ButtonCodeController.php
@@ -127,6 +127,7 @@ class ButtonCodeController extends AbstractController
 
             // Set generator-specific options
             $button_generator->setOption('image', $image);
+            $button_generator->setOption('invitation_style', $invitation_style);
         } else {
             // Make sure locale exists
             if (!$lang || !in_array($lang, $locales_list)) {
diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/AbstractController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/AbstractController.php
index 7bdba681..5a579901 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Chat/AbstractController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Chat/AbstractController.php
@@ -36,7 +36,7 @@ abstract class AbstractController extends BaseAbstractController
     protected function getStyle()
     {
         if (is_null($this->style)) {
-            $this->style = $this->prepareStyle(new ChatStyle(ChatStyle::getDefaultStyle()));
+            $this->style = $this->prepareStyle(new ChatStyle(ChatStyle::getCurrentStyle()));
         }
 
         return $this->style;