diff --git a/README.md b/README.md
index 3f8d615e..eac381c4 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 [![Python Version](https://img.shields.io/badge/python-3.6-brightgreen.svg)](https://python.org)
 [![Flask Version](https://img.shields.io/badge/flask-1.0-brightgreen.svg)](http://flask.pocoo.org/) 
 [![React Version](https://img.shields.io/badge/react-16.4-brightgreen.svg)](https://reactjs.org/)  
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/45d64b31e37e4890a239b8298e66a011)](https://www.codacy.com/app/SamR1/FitTrackee?utm_source=github.com&utm_medium=referral&utm_content=SamR1/mpwo&utm_campaign=badger)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/45d64b31e37e4890a239b8298e66a011)](https://www.codacy.com/app/SamR1/FitTrackee?utm_source=github.com&utm_medium=referral&utm_content=SamR1/mpwo&utm_campaign=Badge_Coverage)<sup><sup>1</sup></sup>
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/290a285f22e94132904dc13b4dd19d1d)](https://www.codacy.com/app/SamR1/FitTrackee)
+[![Codacy Coverage Badge](https://api.codacy.com/project/badge/Coverage/290a285f22e94132904dc13b4dd19d1d)](https://www.codacy.com/app/SamR1/FitTrackee)
 [![Build Status](https://travis-ci.org/SamR1/FitTrackee.svg?branch=master)](https://travis-ci.org/SamR1/FitTrackee)
 
 ---
diff --git a/fittrackee_api/fittrackee_api/activities/stats.py b/fittrackee_api/fittrackee_api/activities/stats.py
index d305f643..8df8e9f3 100644
--- a/fittrackee_api/fittrackee_api/activities/stats.py
+++ b/fittrackee_api/fittrackee_api/activities/stats.py
@@ -12,7 +12,7 @@ from .utils_format import convert_timedelta_to_integer
 stats_blueprint = Blueprint('stats', __name__)
 
 
-def get_activities(user_id, type):
+def get_activities(user_id, filter_type):
     try:
         user = User.query.filter_by(id=user_id).first()
         if not user:
@@ -35,7 +35,7 @@ def get_activities(user_id, type):
         sport_id = params.get('sport_id')
         time = params.get('time')
 
-        if type == 'by_sport':
+        if filter_type == 'by_sport':
             sport_id = params.get('sport_id')
             if sport_id:
                 sport = Sport.query.filter_by(id=sport_id).first()
@@ -59,7 +59,7 @@ def get_activities(user_id, type):
 
         activities_list = {}
         for activity in activities:
-            if type == 'by_sport':
+            if filter_type == 'by_sport':
                 sport_id = activity.sport_id
                 if sport_id not in activities_list:
                     activities_list[sport_id] = {
diff --git a/fittrackee_client/e2e/activities.test.js b/fittrackee_client/e2e/activities.test.js
index 43b092a4..17289f93 100644
--- a/fittrackee_client/e2e/activities.test.js
+++ b/fittrackee_client/e2e/activities.test.js
@@ -18,7 +18,7 @@ test('standard user should be able to add a workout (w/o gpx)', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   await t
diff --git a/fittrackee_client/e2e/admin.test.js b/fittrackee_client/e2e/admin.test.js
index 7f841626..516b919d 100644
--- a/fittrackee_client/e2e/admin.test.js
+++ b/fittrackee_client/e2e/admin.test.js
@@ -23,7 +23,7 @@ test('standard user should not be able to access admin page', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   await t
diff --git a/fittrackee_client/e2e/login.test.js b/fittrackee_client/e2e/login.test.js
index 065b2d2b..55fe8259 100644
--- a/fittrackee_client/e2e/login.test.js
+++ b/fittrackee_client/e2e/login.test.js
@@ -20,7 +20,7 @@ test('should display the registration form', async t => {
     .expect(Selector('input[name="username"]').exists).notOk()
     .expect(Selector('input[name="email"]').exists).ok()
     .expect(Selector('input[name="password"]').exists).ok()
-    .expect(Selector('input[name="passwordConf"]').exists).notOk()
+    .expect(Selector('input[name="password_conf"]').exists).notOk()
 })
 
 test('should throw an error if the user is not registered', async t => {
@@ -47,7 +47,7 @@ test('should allow a user to login', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   await t
diff --git a/fittrackee_client/e2e/profile.test.js b/fittrackee_client/e2e/profile.test.js
index b4429503..1f378de6 100644
--- a/fittrackee_client/e2e/profile.test.js
+++ b/fittrackee_client/e2e/profile.test.js
@@ -19,7 +19,7 @@ test('should be able to access his profile page', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   await t
diff --git a/fittrackee_client/e2e/register.test.js b/fittrackee_client/e2e/register.test.js
index 306211c3..f0c051e6 100644
--- a/fittrackee_client/e2e/register.test.js
+++ b/fittrackee_client/e2e/register.test.js
@@ -20,7 +20,7 @@ test('should display the registration form', async t => {
     .expect(Selector('input[name="username"]').exists).ok()
     .expect(Selector('input[name="email"]').exists).ok()
     .expect(Selector('input[name="password"]').exists).ok()
-    .expect(Selector('input[name="passwordConf"]').exists).ok()
+    .expect(Selector('input[name="password_conf"]').exists).ok()
 })
 
 test('should allow a user to register', async t => {
@@ -32,7 +32,7 @@ test('should allow a user to register', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user is redirected to '/'
@@ -48,7 +48,7 @@ test('should throw an error if the username is taken', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', `${email}2`)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -68,7 +68,7 @@ test('should throw an error if the email is taken', async t => {
     .typeText('input[name="username"]', `${username}2`)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -88,7 +88,7 @@ test('should throw an error if the username is too short', async t => {
     .typeText('input[name="username"]', `${shortUsername}`)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -108,7 +108,7 @@ test('should throw an error if the user is too long', async t => {
     .typeText('input[name="username"]', `${longUsername}`)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -128,7 +128,7 @@ test('should throw an error if the email is invalid', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', invalidEmail)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', password)
+    .typeText('input[name="password_conf"]', password)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -146,7 +146,7 @@ test('should throw an error if passwords don\'t match', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', password)
-    .typeText('input[name="passwordConf"]', `${password}2`)
+    .typeText('input[name="password_conf"]', `${password}2`)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
@@ -166,7 +166,7 @@ test('should throw an error if the password is too short', async t => {
     .typeText('input[name="username"]', username)
     .typeText('input[name="email"]', email)
     .typeText('input[name="password"]', invalidPassword)
-    .typeText('input[name="passwordConf"]', invalidPassword)
+    .typeText('input[name="password_conf"]', invalidPassword)
     .click(Selector('input[type="submit"]'))
 
   // assert user registration failed
diff --git a/fittrackee_client/src/actions/user.js b/fittrackee_client/src/actions/user.js
index f7907447..d90ca41d 100644
--- a/fittrackee_client/src/actions/user.js
+++ b/fittrackee_client/src/actions/user.js
@@ -10,7 +10,7 @@ const AuthErrors = messages => ({ type: 'AUTH_ERRORS', messages })
 
 const PictureError = message => ({ type: 'PICTURE_ERROR', message })
 
-const ProfileSuccess = message => ({ type: 'PROFILE_SUCCESS', message })
+const ProfileSuccess = profil => ({ type: 'PROFILE_SUCCESS', profil })
 
 const ProfileError = message => ({ type: 'PROFILE_ERROR', message })
 
@@ -18,30 +18,13 @@ const ProfileUpdateError = message => ({
   type: 'PROFILE_UPDATE_ERROR', message
 })
 
-const initProfileFormData = user => ({ type: 'INIT_PROFILE_FORM', user })
-
-export const emptyForm = () => ({
-  type: 'EMPTY_USER_FORMDATA'
-})
-
-export const handleFormChange = (target, value) => ({
-  type: 'UPDATE_USER_FORMDATA',
-  target,
-  value,
-})
-
-export const updateProfileFormData = (target, value) => ({
-  type: 'UPDATE_PROFILE_FORMDATA',
-  target,
-  value,
-})
-
 export const getProfile = () => dispatch => FitTrackeeApi
   .getProfile()
   .then(ret => {
     if (ret.status === 'success') {
       dispatch(getData('sports'))
-      return dispatch(ProfileSuccess(ret))
+      ret.data.isAuthenticated = true
+      return dispatch(ProfileSuccess(ret.data))
     }
     return dispatch(ProfileError(ret.message))
   })
@@ -51,11 +34,7 @@ export const getProfile = () => dispatch => FitTrackeeApi
 
 
 export const register = formData => dispatch => FitTrackeeApi
-  .register(
-    formData.username,
-    formData.email,
-    formData.password,
-    formData.passwordConf)
+  .register(formData)
   .then(ret => {
     if (ret.status === 'success') {
       window.localStorage.setItem('authToken', ret.auth_token)
@@ -69,7 +48,7 @@ export const register = formData => dispatch => FitTrackeeApi
 
 
 export const login = formData => dispatch => FitTrackeeApi
-  .login(formData.email, formData.password)
+  .login(formData)
   .then(ret => {
     if (ret.status === 'success') {
       window.localStorage.setItem('authToken', ret.auth_token)
@@ -95,7 +74,7 @@ const RegisterFormControl = formData => {
   if (formData.username.length < 3 || formData.username.length > 12) {
     errMsg.push('Username: 3 to 12 characters required.')
   }
-  if (formData.password !== formData.passwordConf) {
+  if (formData.password !== formData.password_conf) {
     errMsg.push('Password and password confirmation don\'t match.')
   }
   if (formData.password.length < 8) {
@@ -104,41 +83,26 @@ const RegisterFormControl = formData => {
   return errMsg
 }
 
-export const handleUserFormSubmit = (event, formType) => (
-  dispatch,
-  getState
-) => {
-  event.preventDefault()
-  const state = getState()
-  const { formData } = state.formData
-  formData.formData = state.formData.formData
+export const handleUserFormSubmit = (formData, formType) => dispatch => {
   if (formType === 'Login') {
-    return dispatch(login(formData.formData))
+    return dispatch(login(formData))
   }
   // formType === 'Register'
-  const ret = RegisterFormControl(formData.formData)
+  const ret = RegisterFormControl(formData)
   if (ret.length === 0) {
-    return dispatch(register(formData.formData))
+    return dispatch(register(formData))
   }
   return dispatch(AuthErrors(generateIds(ret)))
 }
 
-export const initProfileForm = () => (dispatch, getState) => {
-  const state = getState()
-  return dispatch(initProfileFormData(state.user))
-}
-
-export const handleProfileFormSubmit = event => (dispatch, getState) => {
-  event.preventDefault()
-  const state = getState()
-  if (!state.formProfile.formProfile.password ===
-    state.formProfile.formProfile.passwordConf) {
+export const handleProfileFormSubmit = formData => dispatch => {
+  if (!formData.password === formData.password_conf) {
     return dispatch(ProfileUpdateError(
       'Password and password confirmation don\'t match.'
     ))
   }
   return FitTrackeeApi
-    .updateProfile(state.formProfile.formProfile)
+    .updateProfile(formData)
     .then(ret => {
       if (ret.status === 'success') {
         dispatch(getProfile())
diff --git a/fittrackee_client/src/components/Admin/index.jsx b/fittrackee_client/src/components/Admin/index.jsx
index 1e9b8016..0bd5e21f 100644
--- a/fittrackee_client/src/components/Admin/index.jsx
+++ b/fittrackee_client/src/components/Admin/index.jsx
@@ -19,7 +19,7 @@ function Admin (props) {
         <title>FitTrackee - Admin</title>
       </Helmet>
       {isLoggedIn() ? (
-        user.isAdmin ? (
+        user.admin ? (
           <Switch>
             <Route exact path="/admin" component={AdminMenu} />
             <Route exact path="/admin/sports" component={AdminSports} />
diff --git a/fittrackee_client/src/components/Dashboard/UserStatistics.jsx b/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
index 68edd8ef..a7ee2a74 100644
--- a/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
+++ b/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
@@ -3,12 +3,12 @@ import React from 'react'
 
 export default function UserStatistics (props) {
   const { user } = props
-  const days = user.totalDuration.match(/day/g)
-    ? `${user.totalDuration.split(',')[0]},`
+  const days = user.total_duration.match(/day/g)
+    ? `${user.total_duration.split(',')[0]},`
     : '0 days,'
-  let duration = user.totalDuration.match(/day/g)
-    ? user.totalDuration.split(', ')[1]
-    : user.totalDuration
+  let duration = user.total_duration.match(/day/g)
+    ? user.total_duration.split(', ')[1]
+    : user.total_duration
   duration = `${duration.split(':')[0]}h ${duration.split(':')[1]}min`
   return (
     <div className="row">
@@ -20,7 +20,7 @@ export default function UserStatistics (props) {
             </div>
             <div className="col-9 text-right">
               <div className="huge">{user.nbActivities}</div>
-              <div>{`workout${user.nbActivities === 1 ? '' : 's'}`}</div>
+              <div>{`workout${user.nb_activities === 1 ? '' : 's'}`}</div>
             </div>
           </div>
         </div>
@@ -33,7 +33,7 @@ export default function UserStatistics (props) {
             </div>
             <div className="col-9 text-right">
               <div className="huge">
-                {Number(user.totalDistance).toFixed(2)}
+                {Number(user.total_distance).toFixed(2)}
               </div>
               <div>km</div>
             </div>
@@ -60,8 +60,8 @@ export default function UserStatistics (props) {
               <i className="fa fa-tags fa-3x fa-color" />
             </div>
             <div className="col-9 text-right">
-              <div className="huge">{user.nbSports}</div>
-              <div>{`sport${user.nbSports === 1 ? '' : 's'}`}</div>
+              <div className="huge">{user.nb_sports}</div>
+              <div>{`sport${user.nb_sports === 1 ? '' : 's'}`}</div>
             </div>
           </div>
         </div>
diff --git a/fittrackee_client/src/components/NavBar/index.jsx b/fittrackee_client/src/components/NavBar/index.jsx
index 47ea79de..f2912b10 100644
--- a/fittrackee_client/src/components/NavBar/index.jsx
+++ b/fittrackee_client/src/components/NavBar/index.jsx
@@ -58,7 +58,7 @@ function NavBar(props) {
                   </Link>
                 </li>
               )}
-              {props.user.isAdmin && (
+              {props.user.admin && (
                 <li className="nav-item">
                   <Link
                     className="nav-link"
diff --git a/fittrackee_client/src/components/User/Form.jsx b/fittrackee_client/src/components/User/Form.jsx
index 87e765a3..a4fd16cc 100644
--- a/fittrackee_client/src/components/User/Form.jsx
+++ b/fittrackee_client/src/components/User/Form.jsx
@@ -55,11 +55,11 @@ export default function Form (props) {
             <div className="form-group">
               <input
                 className="form-control input-lg"
-                name="passwordConf"
+                name="password_conf"
                 placeholder="Enter the password confirmation"
                 required
                 type="password"
-                value={props.userForm.passwordConf}
+                value={props.userForm.password_conf}
                 onChange={props.onHandleFormChange}
               />
             </div>
diff --git a/fittrackee_client/src/components/User/Profile.jsx b/fittrackee_client/src/components/User/Profile.jsx
index 2f945a92..9d3c9733 100644
--- a/fittrackee_client/src/components/User/Profile.jsx
+++ b/fittrackee_client/src/components/User/Profile.jsx
@@ -11,7 +11,7 @@ function Profile ({ message, onDeletePicture, onUploadPicture, user }) {
   return (
     <div>
       <Helmet>
-        <title>FitTrackee - {user.username} - Profile</title>
+        <title>FitTrackee - Profile</title>
       </Helmet>
       { message !== '' && (
         <code>{message}</code>
@@ -36,11 +36,16 @@ function Profile ({ message, onDeletePicture, onUploadPicture, user }) {
                   <div className="col-md-8">
                     <p>Email: {user.email}</p>
                     <p>Registration Date: {
-                         format(new Date(user.createdAt), 'DD/MM/YYYY HH:mm')
-                       }</p>
-                    <p>First Name: {user.firstName}</p>
-                    <p>Last Name: {user.lastName}</p>
-                    <p>Birth Date: {user.birthDate}</p>
+                         format(new Date(user.created_at), 'DD/MM/YYYY HH:mm')
+                       }
+                    </p>
+                    <p>First Name: {user.first_name}</p>
+                    <p>Last Name: {user.last_name}</p>
+                    <p>Birth Date: {user.birth_date
+                        ? format(new Date(user.birth_date), 'DD/MM/YYYY')
+                        : ''
+                      }
+                    </p>
                     <p>Location: {user.location}</p>
                     <p>Bio: {user.bio}</p>
                     <p>Time zone: {user.timezone}</p>
diff --git a/fittrackee_client/src/components/User/ProfileEdit.jsx b/fittrackee_client/src/components/User/ProfileEdit.jsx
index 3b0e2d41..9741d369 100644
--- a/fittrackee_client/src/components/User/ProfileEdit.jsx
+++ b/fittrackee_client/src/components/User/ProfileEdit.jsx
@@ -1,198 +1,223 @@
+import { format } from 'date-fns'
 import React from 'react'
 import { Helmet } from 'react-helmet'
 import { connect } from 'react-redux'
 import TimezonePicker from 'react-timezone'
 
-import {
-  initProfileForm,
-  updateProfileFormData,
-  handleProfileFormSubmit
-} from '../../actions/user'
+import { handleProfileFormSubmit } from '../../actions/user'
 import { history } from '../../index'
 
 
 class ProfileEdit extends React.Component {
-  componentDidMount() {
-    this.props.initForm(this.props.user)
+  constructor(props, context) {
+    super(props, context)
+    this.state = {
+      formData: {}
+    }
   }
+
+  componentDidMount() {
+    this.initForm()
+  }
+
+  componentDidUpdate(prevProps) {
+    if (prevProps.user !== this.props.user) {
+      this.initForm()
+    }
+  }
+
+  initForm() {
+    const { user } = this.props
+    const formData = {}
+    Object.keys(user).map(k => user[k] === null
+      ? formData[k] = ''
+      : k === 'birth_date'
+        ? formData[k] = format(new Date(user[k]), 'YYYY-MM-DD')
+        : formData[k] = user[k])
+    this.setState({ formData })
+  }
+
+  handleFormChange(e) {
+    const { formData } = this.state
+    formData[e.target.name] = e.target.value
+    this.setState(formData)
+  }
+
   render () {
-    const { formProfile,
-            onHandleFormChange,
-            onHandleProfileFormSubmit,
-            message,
-            user
-    } = this.props
+    const { onHandleProfileFormSubmit, message, user } = this.props
+    const { formData } = this.state
     return (
       <div>
         <Helmet>
-          <title>FitTrackee - {user.username} - Edit Profile</title>
+          <title>FitTrackee - Edit Profile</title>
         </Helmet>
         { message !== '' && (
             <code>{message}</code>
           )}
-        <div className="container">
-          <h1 className="page-title">Profile Edition</h1>
-          <div className="row">
-            <div className="col-md-2" />
-            <div className="col-md-8">
-              <div className="card">
-                <div className="card-header">
-                  {user.username}
-                </div>
-                <div className="card-body">
-                  <div className="row">
-                    <div className="col-md-12">
-                    <form onSubmit={event =>
-                      onHandleProfileFormSubmit(event)}
-                    >
-                      <div className="form-group">
-                        <label>Email:
-                          <input
-                          name="email"
-                          className="form-control input-lg"
-                          type="text"
-                          value={user.email}
-                          readOnly
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Registration Date:
-                          <input
-                            name="createdAt"
-                            className="form-control input-lg"
-                            type="text"
-                            value={user.createdAt}
-                            readOnly
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Password:
-                          <input
-                            name="password"
-                            className="form-control input-lg"
-                            type="password"
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
+        {formData.isAuthenticated && (
+          <div className="container">
+            <h1 className="page-title">Profile Edition</h1>
+            <div className="row">
+              <div className="col-md-2" />
+              <div className="col-md-8">
+                <div className="card">
+                  <div className="card-header">
+                    {user.username}
+                  </div>
+                  <div className="card-body">
+                    <div className="row">
+                      <div className="col-md-12">
+                      <form onSubmit={event => {
+                        event.preventDefault()
+                        onHandleProfileFormSubmit(formData)
+                      }}
+                      >
                         <div className="form-group">
-                        <label>
-                          Password Confirmation:
-                          <input
-                            name="passwordConf"
-                            className="form-control input-lg"
-                            type="password"
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <hr />
-                      <div className="form-group">
-                        <label>
-                          First Name:
-                          <input
-                            name="firstName"
+                          <label>Email:
+                            <input
+                            name="email"
                             className="form-control input-lg"
                             type="text"
-                            value={formProfile.firstName}
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Last Name:
-                          <input
-                            name="lastName"
-                            className="form-control input-lg"
-                            type="text"
-                            value={formProfile.lastName}
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Birth Date
-                          <input
-                            name="birthDate"
-                            className="form-control input-lg"
-                            type="date"
-                            value={formProfile.birthDate}
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Location:
-                          <input
-                            name="location"
-                            className="form-control input-lg"
-                            type="text"
-                            value={formProfile.location}
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Bio:
-                          <textarea
-                            name="bio"
-                            className="form-control input-lg"
-                            maxLength="200"
-                            type="text"
-                            value={formProfile.bio}
-                            onChange={onHandleFormChange}
-                          />
-                        </label>
-                      </div>
-                      <div className="form-group">
-                        <label>
-                          Timezone:
-                          <TimezonePicker
-                            className="form-control"
-                            onChange={tz => {
-                              const e = { target:
-                                {
-                                  name: 'timezone',
-                                  value: tz ? tz : 'Europe/Paris'
+                            value={formData.email}
+                            readOnly
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Registration Date:
+                            <input
+                              name="createdAt"
+                              className="form-control input-lg"
+                              type="text"
+                              value={formData.created_at}
+                              disabled
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Password:
+                            <input
+                              name="password"
+                              className="form-control input-lg"
+                              type="password"
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                          <div className="form-group">
+                          <label>
+                            Password Confirmation:
+                            <input
+                              name="password_conf"
+                              className="form-control input-lg"
+                              type="password"
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <hr />
+                        <div className="form-group">
+                          <label>
+                            First Name:
+                            <input
+                              name="first_name"
+                              className="form-control input-lg"
+                              type="text"
+                              value={formData.first_name}
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Last Name:
+                            <input
+                              name="last_name"
+                              className="form-control input-lg"
+                              type="text"
+                              value={formData.last_name}
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Birth Date
+                            <input
+                              name="birth_date"
+                              className="form-control input-lg"
+                              type="date"
+                              value={formData.birth_date}
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Location:
+                            <input
+                              name="location"
+                              className="form-control input-lg"
+                              type="text"
+                              value={formData.location}
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Bio:
+                            <textarea
+                              name="bio"
+                              className="form-control input-lg"
+                              maxLength="200"
+                              type="text"
+                              value={formData.bio}
+                              onChange={e => this.handleFormChange(e)}
+                            />
+                          </label>
+                        </div>
+                        <div className="form-group">
+                          <label>
+                            Timezone:
+                            <TimezonePicker
+                              className="form-control"
+                              onChange={tz => {
+                                const e = { target:
+                                  {
+                                    name: 'timezone',
+                                    value: tz ? tz : 'Europe/Paris'
+                                  }
                                 }
-                              }
-                              onHandleFormChange(e)
-                            }}
-                            value={formProfile.timezone
-                              ? formProfile.timezone
-                              : 'Europe/Paris'
-                            }
-                          />
-                        </label>
+                                this.handleFormChange(e)
+                              }}
+                              value={formData.timezone}
+                            />
+                          </label>
+                        </div>
+                        <input
+                          type="submit"
+                          className="btn btn-primary btn-lg btn-block"
+                          value="Submit"
+                        />
+                        <input
+                          type="submit"
+                          className="btn btn-secondary btn-lg btn-block"
+                          onClick={() => history.push('/profile')}
+                          value="Cancel"
+                        />
+                      </form>
                       </div>
-                      <input
-                        type="submit"
-                        className="btn btn-primary btn-lg btn-block"
-                        value="Submit"
-                      />
-                      <input
-                        type="submit"
-                        className="btn btn-secondary btn-lg btn-block"
-                        onClick={() => history.push('/profile')}
-                        value="Cancel"
-                      />
-                    </form>
                     </div>
                   </div>
                 </div>
               </div>
+              <div className="col-md-2" />
             </div>
-            <div className="col-md-2" />
           </div>
-        </div>
+        )}
       </div>
     )
   }
@@ -201,19 +226,13 @@ class ProfileEdit extends React.Component {
 
 export default connect(
   state => ({
-    formProfile: state.formProfile.formProfile,
+    location: state.router.location,
     message: state.message,
     user: state.user,
   }),
   dispatch => ({
-    initForm: () => {
-      dispatch(initProfileForm())
-    },
-    onHandleFormChange: event => {
-      dispatch(updateProfileFormData(event.target.name, event.target.value))
-    },
-    onHandleProfileFormSubmit: event => {
-      dispatch(handleProfileFormSubmit(event))
+    onHandleProfileFormSubmit: formData => {
+      dispatch(handleProfileFormSubmit(formData))
     },
   })
 )(ProfileEdit)
diff --git a/fittrackee_client/src/components/User/UserForm.jsx b/fittrackee_client/src/components/User/UserForm.jsx
index df8e6d0e..bf98cdc7 100644
--- a/fittrackee_client/src/components/User/UserForm.jsx
+++ b/fittrackee_client/src/components/User/UserForm.jsx
@@ -3,32 +3,48 @@ import { connect } from 'react-redux'
 import { Redirect } from 'react-router-dom'
 
 import Form from './Form'
-import {
-  emptyForm,
-  handleFormChange,
-  handleUserFormSubmit
-} from '../../actions/user'
+import { handleUserFormSubmit } from '../../actions/user'
 import { isLoggedIn } from '../../utils'
 
 class UserForm extends React.Component {
+  constructor(props, context) {
+    super(props, context)
+    this.state = {
+      formData: {
+        username: '',
+        email: '',
+        password: '',
+        password_conf: '',
+      }
+    }
+  }
 
   componentDidUpdate(prevProps) {
-    if (
-      (prevProps.location.pathname !== this.props.location.pathname)
-    ) {
-      this.props.onEmptyForm()
+    if (prevProps.location.pathname !== this.props.location.pathname) {
+      this.emptyForm()
     }
   }
 
+  emptyForm() {
+    const { formData } = this.state
+    Object.keys(formData).map(k => formData[k] = '')
+    this.setState(formData)
+  }
+
+  onHandleFormChange(e) {
+    const { formData } = this.state
+    formData[e.target.name] = e.target.value
+    this.setState(formData)
+  }
+
   render() {
     const {
-      formData,
       formType,
       message,
       messages,
-      onHandleFormChange,
       onHandleUserFormSubmit
     } = this.props
+    const { formData } = this.state
     return (
       <div>
         {isLoggedIn() ? (
@@ -52,10 +68,11 @@ class UserForm extends React.Component {
             <Form
               formType={formType}
               userForm={formData}
-              onHandleFormChange={event => onHandleFormChange(event)}
-              handleUserFormSubmit={event =>
-                onHandleUserFormSubmit(event, formType)
-              }
+              onHandleFormChange={event => this.onHandleFormChange(event)}
+              handleUserFormSubmit={event => {
+                  event.preventDefault()
+                  onHandleUserFormSubmit(formData, formType)
+              }}
             />
           </div>
         )}
@@ -65,20 +82,13 @@ class UserForm extends React.Component {
 }
 export default connect(
   state => ({
-    formData: state.formData.formData,
     location: state.router.location,
     message: state.message,
     messages: state.messages,
   }),
   dispatch => ({
-    onEmptyForm: () => {
-      dispatch(emptyForm())
-    },
-    onHandleFormChange: event => {
-      dispatch(handleFormChange(event.target.name, event.target.value))
-    },
-    onHandleUserFormSubmit: (event, formType) => {
-      dispatch(handleUserFormSubmit(event, formType))
+    onHandleUserFormSubmit: (formData, formType) => {
+      dispatch(handleUserFormSubmit(formData, formType))
     },
   })
 )(UserForm)
diff --git a/fittrackee_client/src/fitTrackeeApi/user.js b/fittrackee_client/src/fitTrackeeApi/user.js
index 7b596703..9a08b9b3 100644
--- a/fittrackee_client/src/fitTrackeeApi/user.js
+++ b/fittrackee_client/src/fitTrackeeApi/user.js
@@ -2,31 +2,23 @@ import { apiUrl, createRequest } from '../utils'
 
 export default class FitTrackeeApi {
 
-  static login(email, password) {
+  static login(data) {
     const params = {
       url: `${apiUrl}auth/login`,
       method: 'POST',
       noAuthorization: true,
-      body: {
-        email: email,
-        password: password,
-      },
+      body: data,
       type: 'application/json',
     }
     return createRequest(params)
   }
 
-  static register(username, email, password, passwordConf) {
+  static register(data) {
     const params = {
       url: `${apiUrl}auth/register`,
       method: 'POST',
       noAuthorization: true,
-      body: {
-        username: username,
-        email: email,
-        password: password,
-        password_conf: passwordConf,
-      },
+      body: data,
       type: 'application/json',
     }
     return createRequest(params)
@@ -41,20 +33,11 @@ export default class FitTrackeeApi {
     return createRequest(params)
   }
 
-  static updateProfile(form) {
+  static updateProfile(data) {
     const params = {
       url: `${apiUrl}auth/profile/edit`,
       method: 'POST',
-      body: {
-        first_name: form.firstName,
-        last_name: form.lastName,
-        bio: form.bio,
-        location: form.location,
-        birth_date: form.birthDate,
-        password: form.password,
-        password_conf: form.passwordConf,
-        timezone: form.timezone,
-      },
+      body: data,
       type: 'application/json',
     }
     return createRequest(params)
diff --git a/fittrackee_client/src/reducers/index.js b/fittrackee_client/src/reducers/index.js
index d54e934f..128da7ab 100644
--- a/fittrackee_client/src/reducers/index.js
+++ b/fittrackee_client/src/reducers/index.js
@@ -1,4 +1,3 @@
-import { format } from 'date-fns'
 import { routerReducer } from 'react-router-redux'
 import { combineReducers } from 'redux'
 
@@ -52,51 +51,6 @@ const chartData = (state = initial.chartData, action) => {
   }
 }
 
-const formData = (state = initial.formData, action) => {
-  switch (action.type) {
-    case 'UPDATE_USER_FORMDATA':
-      return {
-        formData: {
-          ...state.formData,
-          [action.target]: action.value
-        },
-      }
-    case 'PROFILE_SUCCESS':
-    case 'EMPTY_USER_FORMDATA':
-      return initial.formData
-    default:
-      return state
-  }
-}
-
-const formProfile = (state = initial.formProfile, action) => {
-  switch (action.type) {
-    case 'UPDATE_PROFILE_FORMDATA':
-      return {
-        formProfile: {
-          ...state.formProfile,
-          [action.target]: action.value
-        },
-      }
-    case 'INIT_PROFILE_FORM':
-      return {
-        formProfile: {
-          ...state.formProfile,
-          firstName: action.user.firstName,
-          lastName: action.user.lastName,
-          birthDate: action.user.birthDate,
-          location: action.user.location,
-          bio: action.user.bio,
-          timezone: action.user.timezone,
-        },
-      }
-    case 'PROFILE_SUCCESS':
-      return initial.formProfile
-    default:
-      return state
-  }
-}
-
 const gpx = (state = initial.gpx, action) => {
   switch (action.type) {
     case 'SET_GPX':
@@ -160,40 +114,7 @@ const user = (state = initial.user, action) => {
       window.localStorage.removeItem('authToken')
       return initial.user
     case 'PROFILE_SUCCESS':
-      return {
-        id: action.message.data.id,
-        username: action.message.data.username,
-        email: action.message.data.email,
-        isAdmin: action.message.data.admin,
-        createdAt: action.message.data.created_at,
-        isAuthenticated: true,
-        firstName: action.message.data.first_name
-                   ? action.message.data.first_name
-                   : '',
-        lastName: action.message.data.last_name
-                   ? action.message.data.last_name
-                   : '',
-        bio: action.message.data.bio
-                   ? action.message.data.bio
-                   : '',
-        location: action.message.data.location
-                   ? action.message.data.location
-                   : '',
-        birthDate: action.message.data.birth_date
-                   ? format(new Date(action.message.data.birth_date),
-                            'DD/MM/YYYY')
-                   : '',
-        picture: action.message.data.picture === true
-                   ? action.message.data.picture
-                   : false,
-        timezone: action.message.data.timezone
-                   ? action.message.data.timezone
-                   : '',
-        nbActivities: action.message.data.nb_activities,
-        nbSports: action.message.data.nb_sports,
-        totalDistance: action.message.data.total_distance,
-        totalDuration: action.message.data.total_duration,
-      }
+      return action.profil
     default:
       return state
   }
@@ -206,8 +127,6 @@ const reducers = combineReducers({
   activities,
   calendarActivities,
   chartData,
-  formData,
-  formProfile,
   gpx,
   loading,
   message,
diff --git a/fittrackee_client/src/reducers/initial.js b/fittrackee_client/src/reducers/initial.js
index f0fb1b05..d570432a 100644
--- a/fittrackee_client/src/reducers/initial.js
+++ b/fittrackee_client/src/reducers/initial.js
@@ -6,37 +6,7 @@ export default {
   message: '',
   messages: [],
   user: {
-    id: '',
-    username: '',
-    email: '',
-    createdAt: '',
-    isAdmin: false,
     isAuthenticated: false,
-    firstName: '',
-    lastName: '',
-    bio: '',
-    location: '',
-    birthDate: '',
-    picture: false
-  },
-  formData: {
-    formData: {
-      username: '',
-      email: '',
-      password: '',
-      passwordConf: '',
-    }
-  },
-  formProfile: {
-    formProfile: {
-      firstName: '',
-      lastName: '',
-      bio: '',
-      location: '',
-      birthDate: '',
-      password: '',
-      passwordConf: '',
-    }
   },
   activities: {
     ...emptyData,