diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index a84c676..a6d1371 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -34,6 +34,7 @@
         </div>
       </div>
 
+      <% if current_user && current_user.provider.nil? %>
       <div class="form-row">
         <div class="field-container">
           <%= f.label :password, class: 'control-label' %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)</i><br />
@@ -69,6 +70,7 @@
           </p>
         </div>
       </div>
+      <% end %>
 
       <div class="row margin-left-none" style="margin-top: 20px">
         <%= f.submit t('.update', :default => "Update"), class: 'btn btn-primary col-md-2' %>
diff --git a/features/users/omniauth.feature b/features/users/omniauth.feature
index f7e8aaf..9ec72a7 100644
--- a/features/users/omniauth.feature
+++ b/features/users/omniauth.feature
@@ -5,5 +5,10 @@ Feature: Omniauth authentication
 
   Scenario: through Colab
     Given I am logged in as a Colab user
-    Given I am at the homepage
-    And I should be logged in
+    When I am at the homepage
+    Then I should be logged in
+    When I click the Edit Account link
+    Then I should not see "Password"
+    And I should not see "Password Confirmation"
+    And I should not see "Current Password"
+
--
libgit2 0.21.2