diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
index fa7c05a806..15b9a8c9ba 100644
--- a/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
+++ b/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
@@ -405,8 +405,13 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
                 } else {
                     self.signInWithAppleButton?.isHidden = true
                     self.dividerNode.isHidden = true
-                    self.nextOptionButtonNode.isHidden = false
-                    items.append(AuthorizationLayoutItem(node: self.nextOptionButtonNode, size: nextOptionSize, spacingBefore: AuthorizationLayoutItemSpacing(weight: 50.0, maxValue: 120.0), spacingAfter: AuthorizationLayoutItemSpacing(weight: 0.0, maxValue: 0.0)))
+                    
+                    if case .email = codeType {
+                        self.nextOptionButtonNode.isHidden = true
+                    } else {
+                        self.nextOptionButtonNode.isHidden = false
+                        items.append(AuthorizationLayoutItem(node: self.nextOptionButtonNode, size: nextOptionSize, spacingBefore: AuthorizationLayoutItemSpacing(weight: 50.0, maxValue: 120.0), spacingAfter: AuthorizationLayoutItemSpacing(weight: 0.0, maxValue: 0.0)))
+                    }
                 }
             }
         } else {
diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequenceEmailEntryControllerNode.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequenceEmailEntryControllerNode.swift
index 98920a6667..f6fde836df 100644
--- a/submodules/AuthorizationUI/Sources/AuthorizationSequenceEmailEntryControllerNode.swift
+++ b/submodules/AuthorizationUI/Sources/AuthorizationSequenceEmailEntryControllerNode.swift
@@ -112,7 +112,8 @@ final class AuthorizationSequenceEmailEntryControllerNode: ASDisplayNode, UIText
         }
         
         self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), height: 50.0, cornerRadius: 11.0, gloss: false)
-
+        self.proceedNode.progressType = .embedded
+        
         self.codeSeparatorNode = ASDisplayNode()
         self.codeSeparatorNode.isLayerBacked = true
         self.codeSeparatorNode.backgroundColor = self.theme.list.itemPlainSeparatorColor
@@ -121,9 +122,12 @@ final class AuthorizationSequenceEmailEntryControllerNode: ASDisplayNode, UIText
         self.codeField.textField.font = Font.regular(20.0)
         self.codeField.textField.textColor = self.theme.list.itemPrimaryTextColor
         self.codeField.textField.textAlignment = .natural
-        self.codeField.textField.keyboardType = .emailAddress
         self.codeField.textField.autocorrectionType = .no
         self.codeField.textField.autocapitalizationType = .none
+        self.codeField.textField.keyboardType = .emailAddress
+        if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
+            self.codeField.textField.textContentType = UITextContentType(rawValue: "")
+        }
         self.codeField.textField.returnKeyType = .done
         self.codeField.textField.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance
         self.codeField.textField.disableAutomaticKeyboardHandling = [.forward, .backward]
diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequenceSignUpControllerNode.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequenceSignUpControllerNode.swift
index 0e2ff4d4ec..fe28caa4bd 100644
--- a/submodules/AuthorizationUI/Sources/AuthorizationSequenceSignUpControllerNode.swift
+++ b/submodules/AuthorizationUI/Sources/AuthorizationSequenceSignUpControllerNode.swift
@@ -150,6 +150,7 @@ final class AuthorizationSequenceSignUpControllerNode: ASDisplayNode, UITextFiel
         self.addPhotoButton.allowsGroupOpacity = true
         
         self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), height: 50.0, cornerRadius: 11.0, gloss: false)
+        self.proceedNode.progressType = .embedded
         
         super.init()