diff --git a/opennebula-common/opennebula-common.post-install b/opennebula-common/opennebula-common.post-install
index f587c9c..5b9c1bb 100644
--- a/opennebula-common/opennebula-common.post-install
+++ b/opennebula-common/opennebula-common.post-install
@@ -7,6 +7,7 @@ ONE_GROUP=cloud
 ONE_USER=oneadmin
 ONE_UID=9869
 ONE_GID=9869
+ONE_COMMENT="OpenNebula administrator account"
 
 create_cloudgroup() {
     if ! getent group $ONE_GROUP > /dev/null 2>&1; then
@@ -16,7 +17,7 @@ create_cloudgroup() {
 
 create_oneuser() {
     if ! getent passwd $ONE_USER > /dev/null 2>&1; then
-        adduser --system --uid $ONE_UID --ingroup $ONE_GROUP --home $ONEHOME --shell /bin/ash $ONE_USER
+        adduser --system --gecos $ONE_COMMENT --uid $ONE_UID --ingroup $ONE_GROUP --home $ONEHOME --shell /bin/ash $ONE_USER
     else
         ONEHOME=`getent passwd $ONE_USER | cut -f6 -d:`
         # Renable user (give him a shell)
@@ -58,3 +59,5 @@ do
 
     chown "${ONE_USER}:${ONE_GROUP}" "${F}"
 done
+
+exit 0