diff --git a/Signal/src/Loki/Components/TextField.swift b/Signal/src/Loki/Components/TextField.swift
index 49cdb6aab..b3f20311b 100644
--- a/Signal/src/Loki/Components/TextField.swift
+++ b/Signal/src/Loki/Components/TextField.swift
@@ -1,12 +1,15 @@
 
 final class TextField : UITextField {
     private let usesDefaultHeight: Bool
+    private let height: CGFloat
+    private let horizontalInset: CGFloat
+    private let verticalInset: CGFloat
 
-    private let horizontalInset = isSmallScreen ? Values.mediumSpacing : Values.largeSpacing
-    private let verticalInset = isSmallScreen ? Values.smallSpacing : Values.largeSpacing
-
-    init(placeholder: String, usesDefaultHeight: Bool = true) {
+    init(placeholder: String, usesDefaultHeight: Bool = true, customHeight: CGFloat? = nil, customHorizontalInset: CGFloat? = nil, customVerticalInset: CGFloat? = nil) {
         self.usesDefaultHeight = usesDefaultHeight
+        self.height = customHeight ?? Values.textFieldHeight
+        self.horizontalInset = customHorizontalInset ?? (isSmallScreen ? Values.mediumSpacing : Values.largeSpacing)
+        self.verticalInset = customVerticalInset ?? (isSmallScreen ? Values.smallSpacing : Values.largeSpacing)
         super.init(frame: CGRect.zero)
         self.placeholder = placeholder
         setUpStyle()
@@ -30,7 +33,7 @@ final class TextField : UITextField {
         tintColor = Colors.accent
         keyboardAppearance = isLightMode ? .light : .dark
         if usesDefaultHeight {
-            set(.height, to: Values.textFieldHeight)
+            set(.height, to: height)
         }
         layer.borderColor = isLightMode ? Colors.text.cgColor : Colors.border.withAlphaComponent(Values.textFieldBorderOpacity).cgColor
         layer.borderWidth = Values.borderThickness
diff --git a/Signal/src/Loki/View Controllers/LinkDeviceVC.swift b/Signal/src/Loki/View Controllers/LinkDeviceVC.swift
index 5033cfe33..e71d6a71b 100644
--- a/Signal/src/Loki/View Controllers/LinkDeviceVC.swift	
+++ b/Signal/src/Loki/View Controllers/LinkDeviceVC.swift	
@@ -150,7 +150,7 @@ private final class EnterPublicKeyVC : UIViewController {
     private var linkButtonBottomConstraint: NSLayoutConstraint!
     
     // MARK: Components
-    private lazy var publicKeyTextField = TextField(placeholder: NSLocalizedString("Enter your Session ID", comment: ""))
+    private lazy var publicKeyTextField = TextField(placeholder: NSLocalizedString("Enter your Session ID", comment: ""), customHeight: 56, customVerticalInset: 12)
     
     // MARK: Lifecycle
     override func viewDidLoad() {
@@ -184,7 +184,7 @@ private final class EnterPublicKeyVC : UIViewController {
         // Set up top stack view
         let topStackView = UIStackView(arrangedSubviews: [ titleLabel, explanationLabel, publicKeyTextField ])
         topStackView.axis = .vertical
-        topStackView.spacing = isSmallScreen ? Values.smallSpacing : Values.largeSpacing
+        topStackView.spacing = Values.smallSpacing
         // Set up spacers
         let topSpacer = UIView.vStretchingSpacer()
         let bottomSpacer = UIView.vStretchingSpacer()