diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
index dc430a35f..5eca45125 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
@@ -62,6 +62,10 @@ public class User extends BaseEntity {
 
     private boolean expandResourceLoadViewCharts = true;
 
+    private String firstName = "";
+
+    private String lastName = "";
+
     /**
      * Necessary for Hibernate. Please, do not call it.
      */
@@ -240,4 +244,20 @@ public class User extends BaseEntity {
         this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts;
     }
 
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
 }
diff --git a/navalplanner-business/src/main/resources/db.changelog-1.1.xml b/navalplanner-business/src/main/resources/db.changelog-1.1.xml
index 9d67c1872..7c0b92385 100644
--- a/navalplanner-business/src/main/resources/db.changelog-1.1.xml
+++ b/navalplanner-business/src/main/resources/db.changelog-1.1.xml
@@ -51,4 +51,14 @@
         <dropColumn tableName="configuration" columnName="expand_resource_load_view_charts"/>
     </changeSet>
 
+    <changeSet id="add-new-fields" author="calvarinop">
+        <comment>Add new column to store the first and last name for this user</comment>
+        <addColumn tableName="user_table">
+            <column name="first_name" type="VARCHAR(255)"/>
+        </addColumn>
+        <addColumn tableName="user_table">
+            <column name="last_name" type="VARCHAR(255)"/>
+        </addColumn>
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
index 9110c3b97..5701d5437 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
@@ -35,6 +35,8 @@
             column="expand_order_planning_view_charts" />
         <property name="expandResourceLoadViewCharts" not-null="true"
             column="expand_resource_load_view_charts" />
+        <property name="firstName" column="first_name"/>
+        <property name="lastName" column="last_name"/>
 
         <!-- Index created in a database-object section -->
         <set name="roles" table="roles_table">
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java
index 6a6afbb3c..1f3aee65c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java
@@ -20,7 +20,6 @@ package org.navalplanner.web.users;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.entities.Language;
-import org.navalplanner.business.users.entities.User;
 
 /**
  * Model for UI operations related to user settings
@@ -51,4 +50,12 @@ public interface ISettingsModel {
 
     boolean isExpandCompanyPlanningViewCharts();
 
+	void setLastName(String lastName);
+
+	String getLastName();
+
+	void setFirstName(String firstName);
+
+	String getFirstName();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java
index ab749eaed..a6acf5edd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java
@@ -126,4 +126,20 @@ public class SettingsController extends GenericForwardComposer {
         return settingsModel.isExpandResourceLoadViewCharts();
     }
 
+	public String getFirstName() {
+		return settingsModel.getFirstName();
+	}
+
+	public void setFirstName(String firstName) {
+		settingsModel.setFirstName(firstName);
+	}
+
+	public String getLastName() {
+		return settingsModel.getLastName();
+	}
+
+	public void setLastName(String lastName) {
+		settingsModel.setLastName(lastName);
+	}
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java
index 58ec1234e..39f77ace6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java
@@ -18,7 +18,6 @@
  */
 package org.navalplanner.web.users;
 
-import org.apache.commons.lang.Validate;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.daos.IUserDAO;
@@ -146,4 +145,28 @@ public class SettingsModel implements ISettingsModel {
         }
     }
 
+	@Override
+	public String getFirstName() {
+		return user.getFirstName();
+	}
+
+	@Override
+	public void setFirstName(String firstName) {
+		if (user != null) {
+			user.setFirstName(firstName);
+		}
+	}
+
+	@Override
+	public String getLastName() {
+		return user.getLastName();
+	}
+
+	@Override
+	public void setLastName(String lastName) {
+		if (user != null) {
+			user.setLastName(lastName);
+		}
+	}
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
index a218a2f00..6442c6878 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
@@ -43,6 +43,16 @@
                                     value="@{controller.user.loginName}" width="300px"
                                     constraint="no empty:${i18n:_('cannot be null or empty')}"/>
                             </row>
+                            <row>
+                                <label value="${i18n:_('First name')}:" />
+                                <textbox id="firstName"
+                                    value="@{controller.user.firstName}" width="300px"/>
+                            </row>
+                            <row>
+                                <label value="${i18n:_('Last name')}:" />
+                                <textbox id="lastName"
+                                    value="@{controller.user.lastName}" width="300px"/>
+                            </row>
                             <row>
                                 <label value="${i18n:_('Password')}:" />
                                 <textbox id="password" type="password"
diff --git a/navalplanner-webapp/src/main/webapp/users/settings.zul b/navalplanner-webapp/src/main/webapp/users/settings.zul
index de0436524..2e41c162a 100644
--- a/navalplanner-webapp/src/main/webapp/users/settings.zul
+++ b/navalplanner-webapp/src/main/webapp/users/settings.zul
@@ -40,7 +40,30 @@
             </tabs>
             <tabpanels>
                 <tabpanel>
+                    <groupbox>
+                        <caption label="${i18n:_('Personal Data')}" />
+                        <grid fixedLayout="true" id="personalData">
+                            <columns>
+                                <column width="200px" />
+                                <column />
+                            </columns>
+                            <rows>
+                                <row>
+                                    <label value="${i18n:_('First name')}:" />
+                                    <textbox id="firstName"
+                                        value="@{settingsController.firstName}" width="300px"/>
+                                </row>
+                                <row>
+                                    <label value="${i18n:_('Last name')}:" />
+                                    <textbox id="lastName"
+                                        value="@{settingsController.lastName}" width="300px"/>
+                                </row>
+                            </rows>
+                        </grid>
+                    </groupbox>
+
                     <groupbox style="margin-top: 5px" closable="false">
+                        <caption label="${i18n:_('Application settings')}" />
                         <grid fixedLayout="true" id="configurationVariables">
                             <columns>
                                 <column width="200px" />