diff --git a/.env.development b/.env.development
index bcae76bea..87b23f10f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,2 @@
 PORT=6010
 REACT_APP_ENVIRONMENT=development
-REACT_APP_MEDIA_VIEWER_ENABLED=true
-REACT_APP_MEDIA_APP_URL=http://localhost:3000
\ No newline at end of file
diff --git a/src/common/constants.js b/src/common/constants.js
index a8682a0a7..848e334f4 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -3,7 +3,6 @@ import ApplicationContext from "../ApplicationContext";
 export const isDevEnv = ApplicationContext.isDevEnv();
 export const isProdEnv = ApplicationContext.isProdEnv();
 export const devEnvUserName = process.env.REACT_APP_DEV_ENV_USER;
-export const isMediaViewerEnabled = process.env.REACT_APP_MEDIA_VIEWER_ENABLED === "true";
 
 //Set by testing tools like Jest
 export const isTestEnv = process.env.NODE_ENV === "test";
diff --git a/src/rootApp/views/SignInView.js b/src/rootApp/views/SignInView.js
index 36d4abeea..35e8e30c5 100644
--- a/src/rootApp/views/SignInView.js
+++ b/src/rootApp/views/SignInView.js
@@ -17,6 +17,7 @@ import Typography from "@material-ui/core/Typography";
 import React, { useState } from "react";
 import SideImage from "../../avni-background.jpeg";
 import { withStyles } from "@material-ui/core/styles";
+import ApplicationContext from "../../ApplicationContext";
 
 function SignInView({
   classes,
@@ -27,6 +28,7 @@ function SignInView({
   disallowForgottenPasswordReset = false
 }) {
   const [passwordIsMasked, setPasswordIsMasked] = useState(true);
+  const autoComplete = ApplicationContext.isDevEnv() ? "on" : "off";
 
   return (
     <Grid container component="main" className={classes.root}>
@@ -49,6 +51,12 @@ function SignInView({
             <form className={classes.form} noValidate>
               <TextField
                 variant="outlined"
+                inputProps={{
+                  autocomplete: autoComplete,
+                  form: {
+                    autocomplete: autoComplete
+                  }
+                }}
                 margin="normal"
                 required
                 fullWidth
@@ -71,6 +79,7 @@ function SignInView({
                 type={passwordIsMasked ? "password" : "text"}
                 onChange={notifyInputChange}
                 id="password"
+                autoComplete={autoComplete}
                 InputProps={{
                   endAdornment: (
                     <InputAdornment position="end">