diff --git a/features/oauth.feature b/features/oauth.feature
index 0388b7cc00a1a0599e7c803433038293a394ed47..1886e8843e31d5bd24188f195d5a94fc4e5b2607 100644
--- a/features/oauth.feature
+++ b/features/oauth.feature
@@ -77,3 +77,19 @@ Feature: oauth
     Then I should be on "/account" on Chubbies
     And I should see my "profile.birthday"
     And I should see my "name"
+
+  Scenario: Login in with Chubbies when you already authorized it
+    Given Chubbies is registered on my pod
+    When I try to authorize Chubbies
+    When I press "Authorize"
+    Then I should be on "/account" on Chubbies
+    And I should see my "profile.birthday"
+    And I should see my "name"
+
+    Then I visit "/new" on Chubbies
+    And I fill in "Diaspora Handle" with "#{@me.diaspora_handle}"
+    And I press "Connect to Diaspora"
+
+    And I debug
+    Then I should be on "/account" on Chubbies
+