Index: bin/backfill_channel_count.py
diff --git a/bin/backfill_channel_count.py b/bin/backfill_channel_count.py
index ead0e2b938fcd00db2d89bcb35e948a7c54834af..1076ad9b48585cdacffb741a5216defc2f3714e4 100755
--- a/bin/backfill_channel_count.py
+++ b/bin/backfill_channel_count.py
@@ -97,15 +97,15 @@ class ChannelCountBackfiller(object):
 
 
 def auth_function():
-  return ("admin", getpass.getpass("Password:"))
+  return (raw_input("Username: "), getpass.getpass("Password:"))
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option("-b", "--actor_batch_size", dest="actor_batch_size",
                     default=100,
                     help="number of actors to fetch in a single query")
-  parser.add_option("-w", "--write", dest="write", default=False,
-                    help="write results back to data store")
+  parser.add_option("-w", "--write", dest="write", action="store_true",
+                    default=False, help="write results back to data store")
   parser.add_option("-a", "--app_id", dest="app_id",
                     help="the app_id of your app, as declared in app.yaml")
   parser.add_option("-s", "--servername", dest="servername",