diff --git a/Podfile b/Podfile
index 350f1893..346f13a7 100644
--- a/Podfile
+++ b/Podfile
@@ -4,6 +4,7 @@ use_frameworks!
 
 def pods
     pod 'DeviceGuru'
+    pod '1PasswordExtension'
     pod 'KeyboardMan'
     pod 'Ruler'
     pod 'Proposer'
diff --git a/Podfile.lock b/Podfile.lock
index f6ec3637..d4246aab 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,4 +1,5 @@
 PODS:
+  - 1PasswordExtension (1.2)
   - AFNetworking (2.5.4):
     - AFNetworking/NSURLConnection (= 2.5.4)
     - AFNetworking/NSURLSession (= 2.5.4)
@@ -43,6 +44,7 @@ PODS:
   - TPKeyboardAvoiding (1.2.9)
 
 DEPENDENCIES:
+  - 1PasswordExtension
   - AFNetworking
   - APAddressBook/Swift
   - DeviceGuru
@@ -58,9 +60,10 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MZFayeClient:
-    :path: ../CatchLib-iOS/MZFayeClient/
+    :path: "../CatchLib-iOS/MZFayeClient/"
 
 SPEC CHECKSUMS:
+  1PasswordExtension: fcf300204bda5b5c78936dbb937a7d661f1ca796
   AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
   APAddressBook: 2c949367b190a993d2cce769a3b20bce8bcf000c
   Base64: 4924bf3ca6fa559a5161ef717291bd450eb7bd1a
diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 0c92ad49..b946655e 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -219,6 +219,7 @@
 		50F2B9781B2EDF3D00F840CC /* BorderTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F2B9771B2EDF3D00F840CC /* BorderTextField.swift */; };
 		50F2B97B1B2EEAF800F840CC /* NavigationTitleLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F2B97A1B2EEAF800F840CC /* NavigationTitleLabel.swift */; };
 		50FA9A441B661698009BF2A0 /* UIViewController+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FA9A431B661698009BF2A0 /* UIViewController+Yep.swift */; };
+		6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6ADDB44F1B848C600012877A /* 1Password.xcassets */; };
 		8409137D1B7DB173001C89D6 /* FriendRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8409137C1B7DB173001C89D6 /* FriendRequestView.swift */; };
 		840CD23C1B7B59D5000D2680 /* ShowStepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840CD23B1B7B59D5000D2680 /* ShowStepViewController.swift */; };
 		840CD23E1B7B84AA000D2680 /* ShowResources in Resources */ = {isa = PBXBuildFile; fileRef = 840CD23D1B7B84AA000D2680 /* ShowResources */; };
@@ -463,6 +464,7 @@
 		50F2B9771B2EDF3D00F840CC /* BorderTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BorderTextField.swift; path = Views/TextFields/BorderTextField.swift; sourceTree = "<group>"; };
 		50F2B97A1B2EEAF800F840CC /* NavigationTitleLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NavigationTitleLabel.swift; path = Views/Labels/NavigationTitleLabel.swift; sourceTree = "<group>"; };
 		50FA9A431B661698009BF2A0 /* UIViewController+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIViewController+Yep.swift"; path = "Extensions/UIViewController+Yep.swift"; sourceTree = "<group>"; };
+		6ADDB44F1B848C600012877A /* 1Password.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = 1Password.xcassets; sourceTree = "<group>"; };
 		8409137C1B7DB173001C89D6 /* FriendRequestView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FriendRequestView.swift; path = Views/FriendRequest/FriendRequestView.swift; sourceTree = "<group>"; };
 		840CD23B1B7B59D5000D2680 /* ShowStepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShowStepViewController.swift; path = ViewControllers/Show/ShowStepViewController.swift; sourceTree = "<group>"; };
 		840CD23D1B7B84AA000D2680 /* ShowResources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ShowResources; sourceTree = "<group>"; };
@@ -589,6 +591,7 @@
 				848806B31B7B4E2E000C5424 /* Show.storyboard */,
 				502AE5171AB70D72005BD199 /* Intro.storyboard */,
 				0A8F54B41AB67D11004AD60E /* Main.storyboard */,
+				6ADDB44F1B848C600012877A /* 1Password.xcassets */,
 				0A8F54B71AB67D11004AD60E /* Images.xcassets */,
 				504BDC141B4528A500DBD35D /* Badges.xcassets */,
 				0A8F54B91AB67D11004AD60E /* LaunchScreen.xib */,
@@ -1733,6 +1736,7 @@
 				5064F6551B0B0E160089FAD4 /* AddFriendSearchCell.xib in Resources */,
 				508F8FC91B0161EF00461B0B /* ProfileSeparationLineCell.xib in Resources */,
 				50894CF61AEA4A01000981AF /* SettingsUserCell.xib in Resources */,
+				6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */,
 				508D17481ACCF4710092D666 /* ChatLeftAudioCell.xib in Resources */,
 				0A8F54B61AB67D11004AD60E /* Main.storyboard in Resources */,
 				5033159D1AC101C80008A209 /* ChatRightTextCell.xib in Resources */,
diff --git a/Yep/1Password.xcassets/onepassword-button-light.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-button-light.imageset/Contents.json
new file mode 100644
index 00000000..8739f6c6
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-button-light.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-button-light.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-button-light@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-button-light@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light.png b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light.png
new file mode 100644
index 00000000..6f4b019e
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@2x.png b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@2x.png
new file mode 100644
index 00000000..2257425a
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@3x.png b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@3x.png
new file mode 100644
index 00000000..95bf09fc
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button-light.imageset/onepassword-button-light@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button-light.pdf b/Yep/1Password.xcassets/onepassword-button-light.pdf
new file mode 100644
index 00000000..504d31c2
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button-light.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-button.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-button.imageset/Contents.json
new file mode 100644
index 00000000..50b11e9b
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-button.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-button@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-button@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button.png b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button.png
new file mode 100644
index 00000000..05d6cf99
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@2x.png b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@2x.png
new file mode 100644
index 00000000..8de12de9
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@3x.png b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@3x.png
new file mode 100644
index 00000000..749ff2fe
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button.imageset/onepassword-button@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-button.pdf b/Yep/1Password.xcassets/onepassword-button.pdf
new file mode 100644
index 00000000..4f88b800
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-button.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-extension-light.imageset/Contents.json
new file mode 100644
index 00000000..84b28a5b
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-extension-light.imageset/Contents.json
@@ -0,0 +1,33 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "filename" : "onepassword-extension-light~compact.png"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "filename" : "onepassword-extension-light@2x~compact.png"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "filename" : "onepassword-extension-light@3x~compact.png"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "filename" : "onepassword-extension-light~regular.png"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "filename" : "onepassword-extension-light@2x~regular.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~compact.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~compact.png
new file mode 100644
index 00000000..6bcb6bba
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~regular.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~regular.png
new file mode 100644
index 00000000..80cf2647
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@2x~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~compact.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~compact.png
new file mode 100644
index 00000000..6e23d542
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~regular.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~regular.png
new file mode 100644
index 00000000..40f7714d
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light@3x~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~compact.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~compact.png
new file mode 100644
index 00000000..267adcb5
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~regular.png b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~regular.png
new file mode 100644
index 00000000..a4d07032
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light.imageset/onepassword-extension-light~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light~compact.pdf b/Yep/1Password.xcassets/onepassword-extension-light~compact.pdf
new file mode 100644
index 00000000..d749244e
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light~compact.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-extension-light~regular.pdf b/Yep/1Password.xcassets/onepassword-extension-light~regular.pdf
new file mode 100644
index 00000000..ebacc005
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension-light~regular.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-extension.imageset/Contents.json
new file mode 100644
index 00000000..475ac081
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-extension.imageset/Contents.json
@@ -0,0 +1,33 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "filename" : "onepassword-extension~compact.png"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "filename" : "onepassword-extension@2x~compact.png"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "filename" : "onepassword-extension@3x~compact.png"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "filename" : "onepassword-extension~regular.png"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "filename" : "onepassword-extension@2x~regular.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~compact.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~compact.png
new file mode 100644
index 00000000..1fa63277
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~regular.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~regular.png
new file mode 100644
index 00000000..0e2dc612
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@2x~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~compact.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~compact.png
new file mode 100644
index 00000000..fe7b3a5f
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~regular.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~regular.png
new file mode 100644
index 00000000..314b771a
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension@3x~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~compact.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~compact.png
new file mode 100644
index 00000000..260b227a
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~compact.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~regular.png b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~regular.png
new file mode 100644
index 00000000..304e03f8
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension.imageset/onepassword-extension~regular.png differ
diff --git a/Yep/1Password.xcassets/onepassword-extension~compact.pdf b/Yep/1Password.xcassets/onepassword-extension~compact.pdf
new file mode 100644
index 00000000..83eb836d
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension~compact.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-extension~regular.pdf b/Yep/1Password.xcassets/onepassword-extension~regular.pdf
new file mode 100644
index 00000000..e291d7ac
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-extension~regular.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar-light.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/Contents.json
new file mode 100644
index 00000000..73390e8e
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-navbar-light.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-navbar-light@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-navbar-light@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light.png b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light.png
new file mode 100644
index 00000000..2f67ddf3
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@2x.png b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@2x.png
new file mode 100644
index 00000000..c592f7f3
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@3x.png b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@3x.png
new file mode 100644
index 00000000..2721b74c
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar-light.imageset/onepassword-navbar-light@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar-light.pdf b/Yep/1Password.xcassets/onepassword-navbar-light.pdf
new file mode 100644
index 00000000..c7c1d52c
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar-light.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-navbar.imageset/Contents.json
new file mode 100644
index 00000000..f8cd9027
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-navbar.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-navbar.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-navbar@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-navbar@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar.png b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar.png
new file mode 100644
index 00000000..d20bc7df
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@2x.png b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@2x.png
new file mode 100644
index 00000000..346dc97f
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@3x.png b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@3x.png
new file mode 100644
index 00000000..24b64962
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar.imageset/onepassword-navbar@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-navbar.pdf b/Yep/1Password.xcassets/onepassword-navbar.pdf
new file mode 100644
index 00000000..a9bd33d2
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-navbar.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/Contents.json
new file mode 100644
index 00000000..56607e7a
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-toolbar-light.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-toolbar-light@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-toolbar-light@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light.png b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light.png
new file mode 100644
index 00000000..38c71234
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@2x.png b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@2x.png
new file mode 100644
index 00000000..98483732
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@3x.png b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@3x.png
new file mode 100644
index 00000000..3ec91b53
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar-light.imageset/onepassword-toolbar-light@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar-light.pdf b/Yep/1Password.xcassets/onepassword-toolbar-light.pdf
new file mode 100644
index 00000000..5495bd6a
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar-light.pdf differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar.imageset/Contents.json b/Yep/1Password.xcassets/onepassword-toolbar.imageset/Contents.json
new file mode 100644
index 00000000..af5f4f8f
--- /dev/null
+++ b/Yep/1Password.xcassets/onepassword-toolbar.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "onepassword-toolbar.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "onepassword-toolbar@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "onepassword-toolbar@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar.png b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar.png
new file mode 100644
index 00000000..27a3ca9e
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@2x.png b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@2x.png
new file mode 100644
index 00000000..37b66012
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@2x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@3x.png b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@3x.png
new file mode 100644
index 00000000..dbf308ac
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar.imageset/onepassword-toolbar@3x.png differ
diff --git a/Yep/1Password.xcassets/onepassword-toolbar.pdf b/Yep/1Password.xcassets/onepassword-toolbar.pdf
new file mode 100644
index 00000000..520eb98b
Binary files /dev/null and b/Yep/1Password.xcassets/onepassword-toolbar.pdf differ
diff --git a/Yep/Base.lproj/Intro.storyboard b/Yep/Base.lproj/Intro.storyboard
index 70b4a15e..b95affc6 100644
--- a/Yep/Base.lproj/Intro.storyboard
+++ b/Yep/Base.lproj/Intro.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="15A226f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 76e49e93..6aa342a7 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
@@ -126,7 +126,7 @@
                                             <userDefinedRuntimeAttribute type="string" keyPath="title" value="Choose photo"/>
                                         </userDefinedRuntimeAttributes>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
                                         <rect key="frame" x="213" y="20" width="174" height="260"/>
                                         <animations/>
                                         <state key="normal">
@@ -823,14 +823,20 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="Syj-dZ-pAz">
-                        <barButtonItem key="rightBarButtonItem" systemItem="cancel" id="Djr-es-XZ6">
+                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="Djr-es-XZ6">
                             <connections>
                                 <action selector="cancel:" destination="pm1-5Q-SW5" id="UyX-Ky-fjg"/>
                             </connections>
                         </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" image="onepassword-navbar" id="b3h-Go-klX">
+                            <connections>
+                                <action selector="fillPassword:" destination="pm1-5Q-SW5" id="6Ru-UD-wEZ"/>
+                            </connections>
+                        </barButtonItem>
                     </navigationItem>
                     <connections>
                         <outlet property="activityIndicator" destination="E58-MH-2nz" id="ulq-yp-00E"/>
+                        <outlet property="onePasswordButton" destination="b3h-Go-klX" id="Qit-XF-jiV"/>
                         <outlet property="webView" destination="9oB-pd-Kh9" id="td2-Id-mqD"/>
                     </connections>
                 </viewController>
@@ -1791,6 +1797,7 @@
         <image name="icon_more_take_photo" width="70" height="50"/>
         <image name="icon_profile_phone" width="16" height="24"/>
         <image name="icon_settings" width="30" height="30"/>
+        <image name="onepassword-navbar" width="23" height="23"/>
         <image name="profile_avatar_frame" width="112" height="112"/>
         <image name="swipe_up" width="21" height="6"/>
         <image name="top_shadow" width="375" height="80"/>
diff --git a/Yep/Info.plist b/Yep/Info.plist
index 49231af8..d78c7f8a 100644
--- a/Yep/Info.plist
+++ b/Yep/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>org-appextension-feature-password-management</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -19,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>66</string>
+	<string>68</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Yep/ViewControllers/OAuth/OAuthViewController.swift b/Yep/ViewControllers/OAuth/OAuthViewController.swift
index eb7bb8d2..7a8c7173 100644
--- a/Yep/ViewControllers/OAuth/OAuthViewController.swift
+++ b/Yep/ViewControllers/OAuth/OAuthViewController.swift
@@ -7,12 +7,15 @@
 //
 
 import UIKit
+import OnePasswordExtension
 
 class OAuthViewController: BaseViewController, UIWebViewDelegate, NSURLConnectionDelegate, NSURLConnectionDataDelegate {
 
     var socialAccount: SocialAccount!
     var afterOAuthAction: ((socialAccount: SocialAccount) -> Void)?
 
+    @IBOutlet weak var onePasswordButton: UIBarButtonItem!
+    
     @IBOutlet weak var webView: UIWebView!
     @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     
@@ -37,8 +40,19 @@ class OAuthViewController: BaseViewController, UIWebViewDelegate, NSURLConnectio
         webView.delegate = self
 
         webViewDidStartLoad(webView)
+        
+        if !OnePasswordExtension.sharedExtension().isAppExtensionAvailable() {
+            self.navigationItem.rightBarButtonItem = nil
+        } else {
+            println("User dosent have one password")
+        }
     }
 
+    @IBAction func fillPassword(sender: AnyObject) {
+        OnePasswordExtension.sharedExtension().fillLoginIntoWebView(webView, forViewController: self, sender: sender) { (finish, error) -> Void in
+            
+        }
+    }
     // MARK: Actions
 
     @IBAction func cancel(sender: UIBarButtonItem) {