diff --git a/app/build.gradle b/app/build.gradle
index 349a5f432..550019cc5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,6 +154,7 @@ android {
             buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
+            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\""
             dimension 'tier'
         }
 
@@ -168,6 +169,7 @@ android {
             buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""
+            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\""
             dimension 'tier'
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index cbdff2e0b..8a41664a9 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
@@ -27,6 +28,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 
@@ -44,6 +46,7 @@ import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
+import fr.free.nrw.commons.ui.widget.HtmlTextView;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -73,7 +76,9 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @BindView(R.id.error_message_container) ViewGroup errorMessageContainer;
     @BindView(R.id.error_message) TextView errorMessage;
     @BindView(R.id.login_credentials) TextView loginCredentials;
-    @BindView(R.id.two_factor_container)TextInputLayout twoFactorContainer;
+    @BindView(R.id.two_factor_container) TextInputLayout twoFactorContainer;
+    @BindView(R.id.forgotPassword) HtmlTextView forgotPasswordText;
+
     ProgressDialog progressDialog;
     private AppCompatDelegate delegate;
     private LoginTextWatcher textWatcher = new LoginTextWatcher();
@@ -114,6 +119,8 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         loginButton.setOnClickListener(view -> performLogin());
         signupButton.setOnClickListener(view -> signUp());
 
+        forgotPasswordText.setOnClickListener(view -> forgotPassword());
+
         if(BuildConfig.FLAVOR == "beta"){
             loginCredentials.setText(getString(R.string.login_credential));
         } else {
@@ -121,6 +128,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         }
     }
 
+    private void forgotPassword() {
+        Utils.handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL));
+    }
+
 
     public void hideKeyboard(View view) {
         InputMethodManager inputMethodManager =(InputMethodManager)this.getSystemService(Activity.INPUT_METHOD_SERVICE);
diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index 2914f9530..deb295438 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -187,12 +187,23 @@
 
                 </LinearLayout>
 
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:visibility="visible"
+                    android:id="@+id/forgotPassword"
+                    android:layout_width="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/forgot_password"
+                    android:textColor="@color/status_bar_blue"/>
+
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/buttonFrame"
+                    android:layout_below="@id/forgotPassword"
                     android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="@dimen/standard_gap"
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index b078e6fe3..819260920 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -187,12 +187,23 @@
 
                 </LinearLayout>
 
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:visibility="visible"
+                    android:id="@+id/forgotPassword"
+                    android:layout_width="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/forgot_password"
+                    android:textColor="@color/status_bar_blue" />
+
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/buttonFrame"
+                    android:layout_below="@id/forgotPassword"
                     android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="@dimen/standard_gap"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b816a37fb..4120c2924 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,7 +7,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_gravity="center_vertical"
         android:layout_marginTop="@dimen/small_gap">
 
         <android.support.v7.widget.CardView
@@ -192,18 +192,30 @@
 
                 </LinearLayout>
 
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:visibility="visible"
+                    android:id="@+id/forgotPassword"
+                    android:layout_width="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/forgot_password"
+                    android:textColor="@color/status_bar_blue" />
+
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/buttonFrame"
+                    android:layout_below="@id/forgotPassword"
                     android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="@dimen/standard_gap"
                     android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
+
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.AppCompatImageView
@@ -222,7 +234,6 @@
             android:elevation="8dp"
             app:srcCompat="@drawable/commons_logo_large"
             tools:ignore="UnusedAttribute" />
-
     </FrameLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3769d24bd..e7da11672 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,8 +5,9 @@
   <string name="menu_settings">Settings</string>
   <string name="username">Username</string>
   <string name="password">Password</string>
-    <string name="login_credential">Log in to your Commons Beta account</string>
+  <string name="login_credential">Log in to your Commons Beta account</string>
   <string name="login">Log in</string>
+  <string name="forgot_password">Forgot Password?</string>
   <string name="signup">Sign up</string>
   <string name="logging_in_title">Logging in</string>
   <string name="logging_in_message">Please wait…</string>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f16d26666..c25f3eb11 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Mar 03 13:58:47 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip