diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 7c60432138..87f12a05d6 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -63,6 +63,7 @@
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
                       android:orientation="vertical"
+                      android:visibility="invisible"
                       tools:visibility="invisible">
 
             <TextView android:id="@+id/backup_created_text"
@@ -226,7 +227,7 @@
                         android:layout_below="@id/header"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        tools:visibility="invisible">
+                        tools:visibility="visible">
 
             <org.thoughtcrime.securesms.components.registration.VerificationCodeView
                     android:id="@+id/code"
@@ -259,16 +260,17 @@
 
 
         <LinearLayout android:id="@+id/pin_container"
-                      android:padding="16dp"
+                      android:paddingTop="30dp"
+                      android:paddingLeft="16dp"
+                      android:paddingRight="16dp"
                       android:paddingBottom="0dp"
-                      android:layout_marginTop="30dp"
                       android:layout_below="@id/header"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
+                      android:layout_width="match_parent"
+                      android:layout_height="match_parent"
                       android:animateLayoutChanges="true"
                       android:orientation="vertical"
                       android:visibility="invisible"
-                      tools:visibility="visible">
+                      tools:visibility="invisible">
 
             <LinearLayout android:id="@+id/pin_clarification_container"
                           android:visibility="gone"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 65260f45a0..4ce1b8a0c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -656,7 +656,7 @@
     <string name="KeyCachingService_signal_passphrase_cached">Touch to open.</string>
     <string name="KeyCachingService_signal_passphrase_cached_with_lock">Touch to open, or touch the lock to close.</string>
     <string name="KeyCachingService_passphrase_cached">Signal is unlocked</string>
-    <string name="KeyCachingService_lock">Lock with passphrase</string>
+    <string name="KeyCachingService_lock">Lock Signal</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">You</string>