diff --git a/mobile/res/layout/http_authentication.xml b/mobile/res/layout/dialog_http_authentication.xml
similarity index 75%
rename from mobile/res/layout/http_authentication.xml
rename to mobile/res/layout/dialog_http_authentication.xml
index 5e68469b..cfa8b9d4 100644
--- a/mobile/res/layout/http_authentication.xml
+++ b/mobile/res/layout/dialog_http_authentication.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    android:id="@+id/dialog_http_authentication"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
         android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="@string/username" />
+        android:layout_marginTop="16dp"
+        android:hint="@string/username"/>
+
     <EditText
         android:id="@+id/password"
-        android:inputType="textPassword"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="16dp"
         android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
-        android:layout_marginBottom="16dp"
-        android:hint="@string/password"/>
+        android:layout_marginTop="4dp"
+        android:hint="@string/password"
+        android:inputType="textPassword"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index defcd13f..e74d1509 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -223,7 +223,6 @@
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="sign_in_action">Sign in</string>
-    <string name="cancel">Cancel</string>
 
     <string name="tab_map">Locate</string>
     <string name="tab_share">Share</string>
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
index ef029793..ede64ac8 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
@@ -1,5 +1,6 @@
 package com.cradle.iitc_mobile;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -10,7 +11,6 @@ import android.net.http.SslError;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.HttpAuthHandler;
 import android.webkit.SslErrorHandler;
@@ -176,17 +176,15 @@ public class IITC_WebViewClient extends WebViewClient {
     }
 
     @Override
-    public void onReceivedHttpAuthRequest(WebView view, final HttpAuthHandler handler,
-                                          final String host, final String realm) {
+    public void onReceivedHttpAuthRequest(final WebView view, final HttpAuthHandler handler, final String host,
+            final String realm) {
         String username = null;
         String password = null;
 
-
-        final boolean reuseHttpAuthUsernamePassword
-                = handler.useHttpAuthUsernamePassword();
+        final boolean reuseHttpAuthUsernamePassword = handler.useHttpAuthUsernamePassword();
 
         if (reuseHttpAuthUsernamePassword && view != null) {
-            String[] credentials = view.getHttpAuthUsernamePassword(host, realm);
+            final String[] credentials = view.getHttpAuthUsernamePassword(host, realm);
             if (credentials != null && credentials.length == 2) {
                 username = credentials[0];
                 password = credentials[1];
@@ -196,33 +194,47 @@ public class IITC_WebViewClient extends WebViewClient {
         if (username != null && password != null) {
             handler.proceed(username, password);
         } else {
-            createSignInDialog(handler, host, realm).show();
+            createSignInDialog(handler, host, realm, username, password).show();
         }
     }
 
-    public Dialog createSignInDialog(final HttpAuthHandler handler, final String host, final String realm) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(mIitc);
-        final LayoutInflater inflater = mIitc.getLayoutInflater();
+    @SuppressLint("InflateParams")
+    // no other way for AlertDialog
+    public Dialog createSignInDialog(final HttpAuthHandler handler, final String host, final String realm,
+            final String username, final String password) {
+        final View v = mIitc.getLayoutInflater().inflate(R.layout.dialog_http_authentication, null);
+        final TextView tvUsername = (TextView) v.findViewById(R.id.username);
+        final TextView tvPassword = (TextView) v.findViewById(R.id.password);
+        final String title = String.format(mIitc.getString(R.string.sign_in_to), host, realm);
 
-        final View v = inflater.inflate(R.layout.http_authentication, null);
-        final TextView user = (TextView) v.findViewById(R.id.username);
-        final TextView pass = (TextView) v.findViewById(R.id.password);
-        final String title = String.format(mIitc.getResources().getString(R.string.sign_in_to), host, realm);
+        if (username != null)
+            tvUsername.setText(username);
+        if (password != null)
+            tvPassword.setText(password);
 
-        builder.setView(v)
-           .setTitle(title)
-           .setPositiveButton(R.string.sign_in_action, new DialogInterface.OnClickListener() {
-               @Override
-               public void onClick(DialogInterface dialog, int id) {
-                   handler.proceed(user.getText().toString(), pass.getText().toString());
-               }
-           })
-           .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-               public void onClick(DialogInterface dialog, int id) {
-                   handler.cancel();
-               }
-           });
-        return builder.create();
+        return new AlertDialog.Builder(mIitc)
+                .setView(v)
+                .setTitle(title)
+                .setCancelable(true)
+                .setPositiveButton(R.string.sign_in_action, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int id) {
+                        handler.proceed(tvUsername.getText().toString(), tvPassword.getText().toString());
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int id) {
+                        dialog.cancel();
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(final DialogInterface dialog) {
+                        handler.cancel();
+                    }
+                })
+                .create();
     }
 
     public void reset() {