diff --git a/src/apps/common/request_passphrase.py b/src/apps/common/request_passphrase.py
index acfc39d6..ab71bcf4 100644
--- a/src/apps/common/request_passphrase.py
+++ b/src/apps/common/request_passphrase.py
@@ -18,7 +18,7 @@ async def request_passphrase_entry(ctx):
     text.render()
 
     ack = await ctx.call(
-        ButtonRequest(code=ButtonRequestType.Other),
+        ButtonRequest(code=ButtonRequestType.PassphraseType),
         wire_types.ButtonAck,
         wire_types.Cancel)
     if ack.MESSAGE_WIRE_TYPE == wire_types.Cancel:
diff --git a/src/apps/management/recovery_device.py b/src/apps/management/recovery_device.py
index 3e42bd11..00b1dcdf 100644
--- a/src/apps/management/recovery_device.py
+++ b/src/apps/management/recovery_device.py
@@ -1,7 +1,7 @@
 from trezor import config, ui, wire
 from trezor.crypto import bip39
 from trezor.messages.ButtonRequest import ButtonRequest
-from trezor.messages.ButtonRequestType import Other
+from trezor.messages.ButtonRequestType import MnemonicWordCount, MnemonicInput
 from trezor.messages.FailureType import ProcessError, UnexpectedMessage
 from trezor.messages.Success import Success
 from trezor.messages.wire_types import ButtonAck
@@ -56,7 +56,7 @@ async def recovery_device(ctx, msg):
 
 @ui.layout
 async def request_wordcount(ctx):
-    await ctx.call(ButtonRequest(code=Other), ButtonAck)
+    await ctx.call(ButtonRequest(code=MnemonicWordCount), ButtonAck)
 
     content = Text('Device recovery', ui.ICON_RECOVERY, 'Number of words?')
     select = WordSelector(content)
@@ -67,7 +67,7 @@ async def request_wordcount(ctx):
 
 @ui.layout
 async def request_mnemonic(ctx, count: int) -> str:
-    await ctx.call(ButtonRequest(code=Other), ButtonAck)
+    await ctx.call(ButtonRequest(code=MnemonicInput), ButtonAck)
 
     words = []
     board = MnemonicKeyboard()