diff --git a/ceilometer/service.py b/ceilometer/service.py
index fd8f4bff1..58343ac22 100644
--- a/ceilometer/service.py
+++ b/ceilometer/service.py
@@ -41,7 +41,7 @@ cfg.CONF.register_opts([
 
 CLI_OPTIONS = [
     cfg.StrOpt('os-username',
-               default=os.environ.get('OS_USERNAME', 'glance'),
+               default=os.environ.get('OS_USERNAME', 'ceilometer'),
                help='Username to use for openstack service access'),
     cfg.StrOpt('os-password',
                default=os.environ.get('OS_PASSWORD', 'admin'),
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index c5929a517..e1ae2aa4c 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -40,7 +40,7 @@ metering_topic                   metering                              the topic
 counter_source                   openstack                             The source name of emited counters
 control_exchange                 ceilometer                            AMQP exchange to connect to if using RabbitMQ or Qpid
 periodic_interval                600                                   seconds between running periodic tasks
-os-username                      glance                                Username to use for openstack service access
+os-username                      ceilometer                            Username to use for openstack service access
 os-password                      admin                                 Password to use for openstack service access
 os-tenant-id                                                           Tenant ID to use for openstack service access
 os-tenant-name                   admin                                 Tenant name to use for openstack service access
diff --git a/doc/source/install.rst b/doc/source/install.rst
index e82b2f4f0..77d6e5cf1 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -83,7 +83,7 @@ Installing the Collector
    to ``rabbit`` or ``qpid`` in ``glance-api.conf`` and restarting the
    service.
 
-3. In order to retrieve object store statistics, ceilometer needs an
+3. In order to retrieve object store statistics, ceilometer needs
    access to swift with ``ResellerAdmin`` role. You should give this
    role to your ``os_username`` user for tenant ``os_tenant_name``::