diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa01dac19..d0da3f294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.1 (22 July 2020)
+
+* Fixed login.py sample to properly handle sitename (#652)
+
 ## 0.12 (10 July 2020)
 
 * Added hidden_views parameter to workbook publish method (#614)
diff --git a/samples/login.py b/samples/login.py
index 57a929f6b..29e02e14e 100644
--- a/samples/login.py
+++ b/samples/login.py
@@ -22,7 +22,7 @@ def main():
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument('--username', '-u', help='username to sign into the server')
     group.add_argument('--token-name', '-n', help='name of the personal access token used to sign into the server')
-    parser.add_argument('--sitename', '-S', default=None)
+    parser.add_argument('--sitename', '-S', default='')
 
     args = parser.parse_args()
 
@@ -36,13 +36,18 @@ def main():
     if args.username:
         # Trying to authenticate using username and password.
         password = getpass.getpass("Password: ")
-        tableau_auth = TSC.TableauAuth(args.username, password)
+
+        print("\nSigning in...\nServer: {}\nSite: {}\nUsername: {}".format(args.server, args.sitename, args.username))
+        tableau_auth = TSC.TableauAuth(args.username, password, site_id=args.sitename)
         with server.auth.sign_in(tableau_auth):
             print('Logged in successfully')
 
     else:
         # Trying to authenticate using personal access tokens.
-        personal_access_token = input("Personal Access Token: ")
+        personal_access_token = getpass.getpass("Personal Access Token: ")
+
+        print("\nSigning in...\nServer: {}\nSite: {}\nToken name: {}"
+              .format(args.server, args.sitename, args.token_name))
         tableau_auth = TSC.PersonalAccessTokenAuth(token_name=args.token_name,
                                                    personal_access_token=personal_access_token, site_id=args.sitename)
         with server.auth.sign_in_with_personal_access_token(tableau_auth):