diff --git a/docs/api/activities.html b/docs/api/activities.html
index ae4ced2a..91d8eed6 100644
--- a/docs/api/activities.html
+++ b/docs/api/activities.html
@@ -370,7 +370,7 @@
 <li><p>Invalid token. Please log in again.</p></li>
 </ul>
 </p></li>
-<li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4">403 Forbidden</a> – You do not have permissions</p></li>
+<li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4">403 Forbidden</a> – You do not have permissions.</p></li>
 <li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.5">404 Not Found</a> – activity not found</p></li>
 </ul>
 </dd>
diff --git a/docs/api/auth.html b/docs/api/auth.html
index a4851413..c2e63983 100644
--- a/docs/api/auth.html
+++ b/docs/api/auth.html
@@ -177,10 +177,10 @@
 <li><p>Sorry. That user already exists.</p></li>
 <li><dl class="simple">
 <dt>Errors:</dt><dd><ul>
-<li><p>Username: 3 to 12 characters required.</p></li>
+<li><p>3 to 12 characters required for usernanme.</p></li>
 <li><p>Valid email must be provided.</p></li>
 <li><p>Password and password confirmation don’t match.</p></li>
-<li><p>Password: 8 characters required.</p></li>
+<li><p>8 characters required for password.</p></li>
 </ul>
 </dd>
 </dl>
diff --git a/docs/api/users.html b/docs/api/users.html
index 9a5b5317..63b10d68 100644
--- a/docs/api/users.html
+++ b/docs/api/users.html
@@ -266,7 +266,7 @@
 </ul>
 </p></li>
 <li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.5">404 Not Found</a> – <ul>
-<li><p>User does not exist</p></li>
+<li><p>User does not exist.</p></li>
 </ul>
 </p></li>
 </ul>
@@ -298,7 +298,7 @@
 <dd class="field-even"><ul class="simple">
 <li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.2.1">200 OK</a> – success</p></li>
 <li><p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.5">404 Not Found</a> – <ul>
-<li><p>User does not exist</p></li>
+<li><p>User does not exist.</p></li>
 <li><p>No picture.</p></li>
 </ul>
 </p></li>
diff --git a/docs/searchindex.js b/docs/searchindex.js
index 7726217f..b3ea4fa4 100644
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["api/activities","api/auth","api/index","api/records","api/sports","api/stats","api/users","changelog","features","index","installation","troubleshooting/administrator","troubleshooting/index","troubleshooting/user"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["api/activities.rst","api/auth.rst","api/index.rst","api/records.rst","api/sports.rst","api/stats.rst","api/users.rst","changelog.md","features.rst","index.rst","installation.rst","troubleshooting/administrator.rst","troubleshooting/index.rst","troubleshooting/user.rst"],objects:{"":{"/api/activities":[0,1,1,"post--api-activities"],"/api/activities/(int:activity_id)":[0,3,1,"patch--api-activities-(int-activity_id)"],"/api/activities/(int:activity_id)/chart_data":[0,0,1,"get--api-activities-(int-activity_id)-chart_data"],"/api/activities/(int:activity_id)/chart_data/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-chart_data-segment-(int-segment_id)"],"/api/activities/(int:activity_id)/gpx":[0,0,1,"get--api-activities-(int-activity_id)-gpx"],"/api/activities/(int:activity_id)/gpx/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-gpx-segment-(int-segment_id)"],"/api/activities/map/(map_id)":[0,0,1,"get--api-activities-map-(map_id)"],"/api/activities/no_gpx":[0,1,1,"post--api-activities-no_gpx"],"/api/auth/login":[1,1,1,"post--api-auth-login"],"/api/auth/logout":[1,0,1,"get--api-auth-logout"],"/api/auth/picture":[1,1,1,"post--api-auth-picture"],"/api/auth/profile":[1,0,1,"get--api-auth-profile"],"/api/auth/profile/edit":[1,1,1,"post--api-auth-profile-edit"],"/api/auth/register":[1,1,1,"post--api-auth-register"],"/api/ping":[6,0,1,"get--api-ping"],"/api/records":[3,0,1,"get--api-records"],"/api/sports":[4,0,1,"get--api-sports"],"/api/sports/(int:sport_id)":[4,0,1,"get--api-sports-(int-sport_id)"],"/api/stats/(int:user_id)/by_sport":[5,0,1,"get--api-stats-(int-user_id)-by_sport"],"/api/stats/(int:user_id)/by_time":[5,0,1,"get--api-stats-(int-user_id)-by_time"],"/api/users":[6,0,1,"get--api-users"],"/api/users/(user_id)":[6,0,1,"get--api-users-(user_id)"],"/api/users/(user_id)/picture":[6,0,1,"get--api-users-(user_id)-picture"]}},objnames:{"0":["http","get","HTTP get"],"1":["http","post","HTTP post"],"2":["http","delete","HTTP delete"],"3":["http","patch","HTTP patch"]},objtypes:{"0":"http:get","1":"http:post","2":"http:delete","3":"http:patch"},terms:{"0mb":[0,1],"10mb":10,"1mb":10,"default":[0,5,10],"export":9,"float":0,"int":[0,4,5],"null":[0,1,6],"return":[0,3],"static":10,"true":[1,6,10],"try":[0,1],For:10,NOT:[0,1,4],Not:[0,1,4,5,6],That:1,The:[7,10],Use:7,_can_be_delet:4,accord:9,account:[7,8],acit:0,activ:[2,5,7,9],activity_d:[0,3],activity_id:[0,3],adapt:10,add:[7,8,9],admin:[1,6,7,8,10],administr:[0,1,7,8,9,12],again:[0,1,3,4,5,6],all:[3,4,5,6,10],allow:[0,1,9,10],alpinequest:9,alreadi:1,also:9,android:9,anymor:7,api:[0,1,3,4,5,6,7,8,9,10,11],app:[9,10],applic:[0,1,3,4,5,6,9,10],arch:10,archiv:10,archlinux:10,ascent:0,auth:[0,1,3,4,5,6],auth_token:1,auth_user_id:[0,3,4,5,6],authent:[0,2,3,4,5,6,9],author:[0,1,3,4,5,6],avail:3,ave_spe:0,ave_speed_from:0,ave_speed_to:0,averag:[0,3,7,8],backup:10,bad:[0,1],bearer:[0,1,3,4,5,6],befor:10,beta:10,bike:[0,4,7,8],bio:[1,6],biographi:1,birth:1,birth_dat:[1,6],bound:0,build:10,by_sport:5,by_tim:5,calcul:7,calendar:[7,8],can:[7,8,9,10],chang:[9,10],charact:[1,12],chart:[0,7,8,10],chart_data:0,check:[6,11],choos:7,client:[10,11],clone:10,code:[0,1,3,4,5,6],column:12,com:[1,6,10],config:[10,11],confirm:1,contact:[0,1],content:[0,1,3,4,5,6],coordin:10,copi:10,correctli:[7,11],creat:[0,1,7,8],created_at:[1,6],creation:[7,8],creation_d:0,credenti:1,current:7,custom:[10,11],cycl:[4,7,8],dai:7,dark:10,darkski:[7,8,10],dashboard:[7,9],data:[0,1,3,4,5,6,9,10,12],databas:10,date:[0,1,5,7,8],debian:10,defaut:10,defin:10,delet:[0,1,7,8],depend:7,desc:0,descent:0,describ:10,descript:10,detail:[6,7,9],develop:9,directori:10,disabl:[1,7,8],displai:[0,7,8,9,10],distanc:[0,3,7,8],distance_from:0,distance_to:0,document:[7,9,10],doe:[0,1,5,6],don:1,download:10,durat:[0,3,7,8],duration_from:0,duration_to:0,dure:[0,1],edit:[1,7,8],elev:[0,7,8,10],email:[1,6,10],encount:10,end:[0,5],endpoint:[2,6,12],enter:[7,8],entiti:[0,1],environ:9,environn:11,error:[0,1,7],europ:[1,6],even:[7,8],exampl:[0,1,3,4,5,6,9,10,11],exce:[0,1],exist:[0,1,5,6,9,11],exodu:9,expir:[0,1,3,4,5,6],extens:[0,1],fa33f4d996844a5c73ecd1ae24456ab8:0,fals:[0,1,4,6],farest:[3,7,8],featur:9,fetch:10,file:[0,1,7,8,9,10,11],filter:[7,8],first:[1,9],first_nam:[1,6],fittracke:10,fittrackee_api:10,fix:9,flask:10,flaticon:10,follow:[3,10],forbidden:[0,1],forecast:10,form:[0,1],format:[0,1,5],former:10,forrunn:9,found:[0,1,4,5,6],frame:5,freepik:10,fri:0,from:[0,3,4,5,6,9,10],gener:10,get:[0,1,3,4,5,6],gif:1,git:10,github:10,gmt:[0,1,3,6],gpl:9,gpx:[0,7,8,9,10],gpxpy:10,have:0,header:[0,1,3,4,5,6],health:6,hike:[4,7,8],his:[7,8],http:[0,1,3,4,5,6,10,11],icon:10,imag:[0,1,6,10],img:4,improv:9,incorrect:7,info:1,inform:[7,9],initi:[10,11],instal:9,instanc:10,integ:[0,3,4,5,6],intern:[0,1],invalid:[0,1,3,4,5,6],issu:[9,10],jan:0,javascript:10,jpeg:6,jpg:1,json:[0,1,3,4,5,6,12],jul:[0,1,3,6],keep:9,kei:[7,8,10],label:4,languag:1,larg:[0,1],last:[1,10],last_nam:[1,6],latitud:0,leaflet:[0,10],least:0,limit:7,line:12,linux:10,list:[7,9],local:9,localhost:[10,11],locat:[1,6],log:[0,1,3,4,5,6,9,10],login:[1,10],logout:1,longest:[3,7,8],longitud:0,made:[10,11],mai:10,make:10,makefil:[10,11],manag:7,mandatori:[0,10],map:[0,7,8,9,10],map_id:0,match:1,max:[0,10],max_alt:0,max_spe:0,max_speed_from:0,max_speed_to:0,maxim:0,maximum:[3,7,8],mean:11,messag:[0,1,6],min_alt:0,minim:0,mobil:9,modification_d:0,mon:0,mondai:[1,5],montain:[7,8],month:[5,7,8],more:[7,9],morn:0,mountain:4,mous:7,move:[0,7],mpwoadmin:10,multipart:[0,1],must:[1,7,8,10],name:1,nb_activ:[1,5,6],nb_sport:[1,6],necessari:10,need:10,network:11,next_act:0,no_gpx:0,note:[0,7,8,10],now:[7,8,10],number:[0,10],oauth:[0,1,3,4,5,6],object:[0,1],one:0,onli:[0,7,8],open:[9,10],option:10,order:0,other:10,out:1,outdoor:9,over:7,own:9,owner:[7,8],packag:[7,10],page:0,pagin:0,paramet:[0,1,3,4,5,6],pari:[1,6],pars:[10,12],part:[0,1],password:[1,10],password_conf:1,past:10,patch:0,paus:[0,7],payload:[0,1],per:0,per_pag:0,permiss:0,pg_dump:10,pictur:[0,1,6,10],ping:6,pipenv:7,pleas:[0,1,3,4,5,6],png:[0,1,4],poetri:[7,10],point:7,pong:6,possibl:9,post:[0,1],postgresql:10,prefer:1,prerequisit:9,previous_act:0,privai:9,product:[9,10],profil:1,project:10,proprietari:9,provid:[0,1,3,4,5,6,7,8],pull:10,python:[7,10],queri:[0,5],react:10,react_app_allow_registr:10,react_app_api_url:11,react_app_gpx_limit_import:10,react_app_max_single_file_s:10,react_app_max_zip_file_s:10,react_app_thunderforest_api_kei:10,readi:[9,10],rebuild:11,rechart:[0,10],record:[0,2,7,8,9],record_typ:[0,3],redux:10,regist:[1,10],registr:[1,7,8],relat:10,releas:[9,10],replac:7,repo:10,report:9,repositori:10,request:[0,1,3,4,5,6,11],requir:1,respons:[0,1,3,4,5,6],restart:10,run:[4,7,8,10],runner:9,sam:[1,6],samr1:10,sat:6,search:7,second:0,see:[7,8,9,10,11],segment:[0,7,8],segment_id:0,select:[0,1],serv:10,server:[0,1,9,10],set:10,sever:9,show:7,signatur:[0,1,3,4,5,6],sinc:10,singl:6,size:[0,1,7,10],sky:10,some:[0,7,10],sorri:1,sort:0,speed:[0,3,7,8,10],sport:[0,2,5,7,8,9,10],sport_id:[0,3,4,5],standard:[7,8],start:[0,1,5,10],stat:[5,7],staticmap:10,statist:[2,9],statu:[0,1,3,4,5,6],step:10,still:9,stop:10,store:9,street:9,string:[0,1,5],success:[0,1,3,4,5,6],successfulli:1,sun:[0,1,3,6],sundai:[0,5],support:[7,8],system:10,tab:11,tar:10,test:10,them:9,thi:[0,7,9,10],thunderforest:10,time:[0,1,5,7,8],timezon:[1,6,7],titl:0,todo:[10,13],token:[0,1,3,4,5,6],too:[0,1],tooltip:7,total:7,total_dist:[1,5,6],total_dur:[1,5,6],track:9,tracker:9,transport:[4,7,8],troubleshoot:9,type:[0,1,3,4,5,6],unauthor:[0,1,3,4,5,6],undefin:11,under:9,unexpect:12,updat:[0,1,7,10],upgrad:9,upload:[7,8,10],user:[0,1,2,3,4,5,7,9,10,12],user_id:[0,3,5,6],usernam:[1,6],using:[0,9],valid:[0,1,3,4,5,6],valu:[0,3,10],variabl:[9,11],version:[9,10],view:7,virtualenv:10,walk:[4,7,8],weather:[7,8,10],weather_api:10,weather_end:0,weather_start:0,web:[0,1,3,4,5,6,9],week:[1,5,7],weekm:[1,5],were:7,wget:10,when:7,wiki:7,with_gpx:0,without:[0,5,7,8,9],workout:9,written:10,www:10,xzf:10,yaourt:10,yarn:10,year:5,yet:[9,10],you:[0,9],your:9,zip:[0,10],zone:1},titles:["Activities","Authentication","API documentation","Records","Sports","Statistics","Users","Change log","Features","FitTrackee","Installation","Administrator","Troubleshooting","User"],titleterms:{"new":7,activ:[0,8],administr:11,api:2,authent:1,bug:7,chang:7,charact:11,close:7,column:11,content:9,dashboard:8,data:11,detail:8,dev:10,document:2,environ:10,featur:[7,8],first:7,fittracke:9,fix:7,improv:7,instal:10,issu:7,json:11,line:11,list:8,log:7,misc:7,pars:11,prerequisit:10,prod:10,record:3,releas:7,sport:4,statist:[5,7,8],tabl:9,troubleshoot:12,unexpect:11,upgrad:10,user:[6,8,13],variabl:10,version:7,workout:8}})
\ No newline at end of file
+Search.setIndex({docnames:["api/activities","api/auth","api/index","api/records","api/sports","api/stats","api/users","changelog","features","index","installation","troubleshooting/administrator","troubleshooting/index","troubleshooting/user"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["api/activities.rst","api/auth.rst","api/index.rst","api/records.rst","api/sports.rst","api/stats.rst","api/users.rst","changelog.md","features.rst","index.rst","installation.rst","troubleshooting/administrator.rst","troubleshooting/index.rst","troubleshooting/user.rst"],objects:{"":{"/api/activities":[0,1,1,"post--api-activities"],"/api/activities/(int:activity_id)":[0,3,1,"patch--api-activities-(int-activity_id)"],"/api/activities/(int:activity_id)/chart_data":[0,0,1,"get--api-activities-(int-activity_id)-chart_data"],"/api/activities/(int:activity_id)/chart_data/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-chart_data-segment-(int-segment_id)"],"/api/activities/(int:activity_id)/gpx":[0,0,1,"get--api-activities-(int-activity_id)-gpx"],"/api/activities/(int:activity_id)/gpx/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-gpx-segment-(int-segment_id)"],"/api/activities/map/(map_id)":[0,0,1,"get--api-activities-map-(map_id)"],"/api/activities/no_gpx":[0,1,1,"post--api-activities-no_gpx"],"/api/auth/login":[1,1,1,"post--api-auth-login"],"/api/auth/logout":[1,0,1,"get--api-auth-logout"],"/api/auth/picture":[1,1,1,"post--api-auth-picture"],"/api/auth/profile":[1,0,1,"get--api-auth-profile"],"/api/auth/profile/edit":[1,1,1,"post--api-auth-profile-edit"],"/api/auth/register":[1,1,1,"post--api-auth-register"],"/api/ping":[6,0,1,"get--api-ping"],"/api/records":[3,0,1,"get--api-records"],"/api/sports":[4,0,1,"get--api-sports"],"/api/sports/(int:sport_id)":[4,0,1,"get--api-sports-(int-sport_id)"],"/api/stats/(int:user_id)/by_sport":[5,0,1,"get--api-stats-(int-user_id)-by_sport"],"/api/stats/(int:user_id)/by_time":[5,0,1,"get--api-stats-(int-user_id)-by_time"],"/api/users":[6,0,1,"get--api-users"],"/api/users/(user_id)":[6,0,1,"get--api-users-(user_id)"],"/api/users/(user_id)/picture":[6,0,1,"get--api-users-(user_id)-picture"]}},objnames:{"0":["http","get","HTTP get"],"1":["http","post","HTTP post"],"2":["http","delete","HTTP delete"],"3":["http","patch","HTTP patch"]},objtypes:{"0":"http:get","1":"http:post","2":"http:delete","3":"http:patch"},terms:{"0mb":[0,1],"10mb":10,"1mb":10,"default":[0,5,10],"export":9,"float":0,"int":[0,4,5],"null":[0,1,6],"return":[0,3],"static":10,"true":[1,6,10],"try":[0,1],For:10,NOT:[0,1,4],Not:[0,1,4,5,6],That:1,The:[7,10],Use:7,_can_be_delet:4,accord:9,account:[7,8],acit:0,activ:[2,5,7,9],activity_d:[0,3],activity_id:[0,3],adapt:10,add:[7,8,9],admin:[1,6,7,8,10],administr:[0,1,7,8,9,12],again:[0,1,3,4,5,6],all:[3,4,5,6,10],allow:[0,1,9,10],alpinequest:9,alreadi:1,also:9,android:9,anymor:7,api:[0,1,3,4,5,6,7,8,9,10,11],app:[9,10],applic:[0,1,3,4,5,6,9,10],arch:10,archiv:10,archlinux:10,ascent:0,auth:[0,1,3,4,5,6],auth_token:1,auth_user_id:[0,3,4,5,6],authent:[0,2,3,4,5,6,9],author:[0,1,3,4,5,6],avail:3,ave_spe:0,ave_speed_from:0,ave_speed_to:0,averag:[0,3,7,8],backup:10,bad:[0,1],bearer:[0,1,3,4,5,6],befor:10,beta:10,bike:[0,4,7,8],bio:[1,6],biographi:1,birth:1,birth_dat:[1,6],bound:0,build:10,by_sport:5,by_tim:5,calcul:7,calendar:[7,8],can:[7,8,9,10],chang:[9,10],charact:[1,12],chart:[0,7,8,10],chart_data:0,check:[6,11],choos:7,client:[10,11],clone:10,code:[0,1,3,4,5,6],column:12,com:[1,6,10],config:[10,11],confirm:1,contact:[0,1],content:[0,1,3,4,5,6],coordin:10,copi:10,correctli:[7,11],creat:[0,1,7,8],created_at:[1,6],creation:[7,8],creation_d:0,credenti:1,current:7,custom:[10,11],cycl:[4,7,8],dai:7,dark:10,darkski:[7,8,10],dashboard:[7,9],data:[0,1,3,4,5,6,9,10,12],databas:10,date:[0,1,5,7,8],debian:10,defaut:10,defin:10,delet:[0,1,7,8],depend:7,desc:0,descent:0,describ:10,descript:10,detail:[6,7,9],develop:9,directori:10,disabl:[1,7,8],displai:[0,7,8,9,10],distanc:[0,3,7,8],distance_from:0,distance_to:0,document:[7,9,10],doe:[0,1,5,6],don:1,download:10,durat:[0,3,7,8],duration_from:0,duration_to:0,dure:[0,1],edit:[1,7,8],elev:[0,7,8,10],email:[1,6,10],encount:10,end:[0,5],endpoint:[2,6,12],enter:[7,8],entiti:[0,1],environ:9,environn:11,error:[0,1,7],europ:[1,6],even:[7,8],exampl:[0,1,3,4,5,6,9,10,11],exce:[0,1],exist:[0,1,5,6,9,11],exodu:9,expir:[0,1,3,4,5,6],extens:[0,1],fa33f4d996844a5c73ecd1ae24456ab8:0,fals:[0,1,4,6],farest:[3,7,8],featur:9,fetch:10,file:[0,1,7,8,9,10,11],filter:[7,8],first:[1,9],first_nam:[1,6],fittracke:10,fittrackee_api:10,fix:9,flask:10,flaticon:10,follow:[3,10],forbidden:[0,1],forecast:10,form:[0,1],format:[0,1,5],former:10,forrunn:9,found:[0,1,4,5,6],frame:5,freepik:10,fri:0,from:[0,3,4,5,6,9,10],gener:10,get:[0,1,3,4,5,6],gif:1,git:10,github:10,gmt:[0,1,3,6],gpl:9,gpx:[0,7,8,9,10],gpxpy:10,have:0,header:[0,1,3,4,5,6],health:6,hike:[4,7,8],his:[7,8],http:[0,1,3,4,5,6,10,11],icon:10,imag:[0,1,6,10],img:4,improv:9,incorrect:7,info:1,inform:[7,9],initi:[10,11],instal:9,instanc:10,integ:[0,3,4,5,6],intern:[0,1],invalid:[0,1,3,4,5,6],issu:[9,10],jan:0,javascript:10,jpeg:6,jpg:1,json:[0,1,3,4,5,6,12],jul:[0,1,3,6],keep:9,kei:[7,8,10],label:4,languag:1,larg:[0,1],last:[1,10],last_nam:[1,6],latitud:0,leaflet:[0,10],least:0,limit:7,line:12,linux:10,list:[7,9],local:9,localhost:[10,11],locat:[1,6],log:[0,1,3,4,5,6,9,10],login:[1,10],logout:1,longest:[3,7,8],longitud:0,made:[10,11],mai:10,make:10,makefil:[10,11],manag:7,mandatori:[0,10],map:[0,7,8,9,10],map_id:0,match:1,max:[0,10],max_alt:0,max_spe:0,max_speed_from:0,max_speed_to:0,maxim:0,maximum:[3,7,8],mean:11,messag:[0,1,6],min_alt:0,minim:0,mobil:9,modification_d:0,mon:0,mondai:[1,5],montain:[7,8],month:[5,7,8],more:[7,9],morn:0,mountain:4,mous:7,move:[0,7],mpwoadmin:10,multipart:[0,1],must:[1,7,8,10],name:1,nb_activ:[1,5,6],nb_sport:[1,6],necessari:10,need:10,network:11,next_act:0,no_gpx:0,note:[0,7,8,10],now:[7,8,10],number:[0,10],oauth:[0,1,3,4,5,6],object:[0,1],one:0,onli:[0,7,8],open:[9,10],option:10,order:0,other:10,out:1,outdoor:9,over:7,own:9,owner:[7,8],packag:[7,10],page:0,pagin:0,paramet:[0,1,3,4,5,6],pari:[1,6],pars:[10,12],part:[0,1],password:[1,10],password_conf:1,past:10,patch:0,paus:[0,7],payload:[0,1],per:0,per_pag:0,permiss:0,pg_dump:10,pictur:[0,1,6,10],ping:6,pipenv:7,pleas:[0,1,3,4,5,6],png:[0,1,4],poetri:[7,10],point:7,pong:6,possibl:9,post:[0,1],postgresql:10,prefer:1,prerequisit:9,previous_act:0,privai:9,product:[9,10],profil:1,project:10,proprietari:9,provid:[0,1,3,4,5,6,7,8],pull:10,python:[7,10],queri:[0,5],react:10,react_app_allow_registr:10,react_app_api_url:11,react_app_gpx_limit_import:10,react_app_max_single_file_s:10,react_app_max_zip_file_s:10,react_app_thunderforest_api_kei:10,readi:[9,10],rebuild:11,rechart:[0,10],record:[0,2,7,8,9],record_typ:[0,3],redux:10,regist:[1,10],registr:[1,7,8],relat:10,releas:[9,10],replac:7,repo:10,report:9,repositori:10,request:[0,1,3,4,5,6,11],requir:1,respons:[0,1,3,4,5,6],restart:10,run:[4,7,8,10],runner:9,sam:[1,6],samr1:10,sat:6,search:7,second:0,see:[7,8,9,10,11],segment:[0,7,8],segment_id:0,select:[0,1],serv:10,server:[0,1,9,10],set:10,sever:9,show:7,signatur:[0,1,3,4,5,6],sinc:10,singl:6,size:[0,1,7,10],sky:10,some:[0,7,10],sorri:1,sort:0,speed:[0,3,7,8,10],sport:[0,2,5,7,8,9,10],sport_id:[0,3,4,5],standard:[7,8],start:[0,1,5,10],stat:[5,7],staticmap:10,statist:[2,9],statu:[0,1,3,4,5,6],step:10,still:9,stop:10,store:9,street:9,string:[0,1,5],success:[0,1,3,4,5,6],successfulli:1,sun:[0,1,3,6],sundai:[0,5],support:[7,8],system:10,tab:11,tar:10,test:10,them:9,thi:[0,7,9,10],thunderforest:10,time:[0,1,5,7,8],timezon:[1,6,7],titl:0,todo:[10,13],token:[0,1,3,4,5,6],too:[0,1],tooltip:7,total:7,total_dist:[1,5,6],total_dur:[1,5,6],track:9,tracker:9,transport:[4,7,8],troubleshoot:9,type:[0,1,3,4,5,6],unauthor:[0,1,3,4,5,6],undefin:11,under:9,unexpect:12,updat:[0,1,7,10],upgrad:9,upload:[7,8,10],user:[0,1,2,3,4,5,7,9,10,12],user_id:[0,3,5,6],usernam:[1,6],usernanm:1,using:[0,9],valid:[0,1,3,4,5,6],valu:[0,3,10],variabl:[9,11],version:[9,10],view:7,virtualenv:10,walk:[4,7,8],weather:[7,8,10],weather_api:10,weather_end:0,weather_start:0,web:[0,1,3,4,5,6,9],week:[1,5,7],weekm:[1,5],were:7,wget:10,when:7,wiki:7,with_gpx:0,without:[0,5,7,8,9],workout:9,written:10,www:10,xzf:10,yaourt:10,yarn:10,year:5,yet:[9,10],you:[0,9],your:9,zip:[0,10],zone:1},titles:["Activities","Authentication","API documentation","Records","Sports","Statistics","Users","Change log","Features","FitTrackee","Installation","Administrator","Troubleshooting","User"],titleterms:{"new":7,activ:[0,8],administr:11,api:2,authent:1,bug:7,chang:7,charact:11,close:7,column:11,content:9,dashboard:8,data:11,detail:8,dev:10,document:2,environ:10,featur:[7,8],first:7,fittracke:9,fix:7,improv:7,instal:10,issu:7,json:11,line:11,list:8,log:7,misc:7,pars:11,prerequisit:10,prod:10,record:3,releas:7,sport:4,statist:[5,7,8],tabl:9,troubleshoot:12,unexpect:11,upgrad:10,user:[6,8,13],variabl:10,version:7,workout:8}})
\ No newline at end of file
diff --git a/fittrackee_api/fittrackee_api/activities/activities.py b/fittrackee_api/fittrackee_api/activities/activities.py
index 6c80ee62..8079238a 100644
--- a/fittrackee_api/fittrackee_api/activities/activities.py
+++ b/fittrackee_api/fittrackee_api/activities/activities.py
@@ -341,7 +341,7 @@ def get_activity(auth_user_id, activity_id):
         - Provide a valid auth token.
         - Signature expired. Please log in again.
         - Invalid token. Please log in again.
-    :statuscode 403: You do not have permissions
+    :statuscode 403: You do not have permissions.
     :statuscode 404: activity not found
 
     """
diff --git a/fittrackee_api/fittrackee_api/tests/test_auth_api.py b/fittrackee_api/fittrackee_api/tests/test_auth_api.py
index f0034253..cbd9e0b5 100644
--- a/fittrackee_api/fittrackee_api/tests/test_auth_api.py
+++ b/fittrackee_api/fittrackee_api/tests/test_auth_api.py
@@ -63,8 +63,8 @@ def test_user_registration_invalid_short_username(app):
     data = json.loads(response.data.decode())
     assert data['status'] == 'error'
     assert (
-        data['message'] == "Errors: Username: 3 to 12 characters required.\n"
-    )  # noqa
+        data['message'] == "Username: 3 to 12 characters required.\n"
+    )
     assert response.content_type == 'application/json'
     assert response.status_code == 400
 
@@ -86,8 +86,8 @@ def test_user_registration_invalid_long_username(app):
     data = json.loads(response.data.decode())
     assert data['status'] == 'error'
     assert (
-        data['message'] == "Errors: Username: 3 to 12 characters required.\n"
-    )  # noqa
+        data['message'] == "Username: 3 to 12 characters required.\n"
+    )
     assert response.content_type == 'application/json'
     assert response.status_code == 400
 
@@ -108,7 +108,7 @@ def test_user_registration_invalid_email(app):
     )
     data = json.loads(response.data.decode())
     assert data['status'] == 'error'
-    assert data['message'] == "Errors: Valid email must be provided.\n"  # noqa
+    assert data['message'] == "Valid email must be provided.\n"
     assert response.content_type == 'application/json'
     assert response.status_code == 400
 
@@ -130,8 +130,8 @@ def test_user_registration_invalid_short_password(app):
     data = json.loads(response.data.decode())
     assert data['status'] == 'error'
     assert (
-        data['message'] == "Errors: Password: 8 characters required.\n"
-    )  # noqa
+        data['message'] == "Password: 8 characters required.\n"
+    )
     assert response.content_type == 'application/json'
     assert response.status_code == 400
 
@@ -154,8 +154,8 @@ def test_user_registration_mismatched_password(app):
     assert data['status'] == 'error'
     assert (
         data['message']
-        == "Errors: Password and password confirmation don\'t match.\n"
-    )  # noqa
+        == "Password and password confirmation don\'t match.\n"
+    )
     assert response.content_type == 'application/json'
     assert response.status_code == 400
 
@@ -262,7 +262,7 @@ def test_user_registration_invalid_data(app):
     assert (
         'Error. Please try again or contact the administrator.'
         in data['message']
-    )  # noqa
+    )
     assert 'error' in data['status']
 
 
@@ -700,7 +700,7 @@ def test_user_profile_invalid_password(app, user_1):
     assert data['status'] == 'error'
     assert (
         data['message'] == 'Password and password confirmation don\'t match.\n'
-    )  # noqa
+    )
     assert response.status_code == 400
 
 
@@ -736,7 +736,7 @@ def test_user_profile_missing_password_conf(app, user_1):
     assert data['status'] == 'error'
     assert (
         data['message'] == 'Password and password confirmation don\'t match.\n'
-    )  # noqa
+    )
     assert response.status_code == 400
 
 
diff --git a/fittrackee_api/fittrackee_api/users/auth.py b/fittrackee_api/fittrackee_api/users/auth.py
index d3248f3c..2e287b31 100644
--- a/fittrackee_api/fittrackee_api/users/auth.py
+++ b/fittrackee_api/fittrackee_api/users/auth.py
@@ -68,10 +68,10 @@ def register_user():
         - Invalid payload.
         - Sorry. That user already exists.
         - Errors:
-            - Username: 3 to 12 characters required.
+            - 3 to 12 characters required for usernanme.
             - Valid email must be provided.
             - Password and password confirmation don't match.
-            - Password: 8 characters required.
+            - 8 characters required for password.
     :statuscode 403:
         Error. Registration is disabled.
     :statuscode 500:
@@ -112,7 +112,7 @@ def register_user():
         }
         return jsonify(response_object), 500
     if ret != '':
-        response_object = {'status': 'error', 'message': 'Errors: ' + ret}
+        response_object = {'status': 'error', 'message': ret}
         return jsonify(response_object), 400
 
     try:
@@ -553,7 +553,7 @@ def edit_picture(user_id):
         max_file_size = current_app.config['MAX_CONTENT_LENGTH']
         response_object = {
             'status': 'fail',
-            'message': 'Error during picture update: file size exceeds '
+            'message': 'Error during picture update, file size exceeds '
             f'{display_readable_file_size(max_file_size)}.',
         }
         return jsonify(response_object), 413
diff --git a/fittrackee_api/fittrackee_api/users/users.py b/fittrackee_api/fittrackee_api/users/users.py
index b220fc42..3cd856e1 100644
--- a/fittrackee_api/fittrackee_api/users/users.py
+++ b/fittrackee_api/fittrackee_api/users/users.py
@@ -143,7 +143,7 @@ def get_single_user(auth_user_id, user_id):
         - Signature expired. Please log in again.
         - Invalid token. Please log in again.
     :statuscode 404:
-        - User does not exist
+        - User does not exist.
     """
 
     response_object = {'status': 'fail', 'message': 'User does not exist.'}
@@ -180,7 +180,7 @@ def get_picture(user_id):
 
     :statuscode 200: success
     :statuscode 404:
-        - User does not exist
+        - User does not exist.
         - No picture.
 
     """
diff --git a/fittrackee_api/fittrackee_api/users/utils.py b/fittrackee_api/fittrackee_api/users/utils.py
index 2e4656b2..f99a1aad 100644
--- a/fittrackee_api/fittrackee_api/users/utils.py
+++ b/fittrackee_api/fittrackee_api/users/utils.py
@@ -66,7 +66,7 @@ def verify_extension_and_size(file_type, req):
     elif file_extension != 'zip' and req.content_length > max_file_size:
         response_object = {
             'status': 'fail',
-            'message': 'Error during picture update: file size exceeds '
+            'message': 'Error during picture update, file size exceeds '
             f'{display_readable_file_size(max_file_size)}.',
         }
         code = 413
diff --git a/fittrackee_client/src/actions/user.js b/fittrackee_client/src/actions/user.js
index 73aea48d..92bf4786 100644
--- a/fittrackee_client/src/actions/user.js
+++ b/fittrackee_client/src/actions/user.js
@@ -61,13 +61,13 @@ export const loginOrRegister = (target, formData) => dispatch =>
 const RegisterFormControl = formData => {
   const errMsg = []
   if (formData.username.length < 3 || formData.username.length > 12) {
-    errMsg.push('Username: 3 to 12 characters required.')
+    errMsg.push('3 to 12 characters required for username.')
   }
   if (formData.password !== formData.password_conf) {
     errMsg.push("Password and password confirmation don't match.")
   }
   if (formData.password.length < 8) {
-    errMsg.push('Password: 8 characters required.')
+    errMsg.push('8 characters required for password.')
   }
   return errMsg
 }
@@ -112,7 +112,10 @@ export const uploadPicture = event => dispatch => {
       if (ret.status === 'success') {
         return dispatch(getProfile())
       }
-      return dispatch(PictureError(ret.message))
+      const msg = ret.message.match(/file size exceeds/g)
+        ? 'Error during picture update, file size exceeds max size.'
+        : ret.message
+      return dispatch(PictureError(msg))
     })
     .catch(error => {
       throw error
diff --git a/fittrackee_client/src/components/Activities/index.jsx b/fittrackee_client/src/components/Activities/index.jsx
index 1889e3bc..7e2626bd 100644
--- a/fittrackee_client/src/components/Activities/index.jsx
+++ b/fittrackee_client/src/components/Activities/index.jsx
@@ -55,7 +55,7 @@ class Activities extends React.Component {
           <title>FitTrackee - {t('common:Workouts')}</title>
         </Helmet>
         {message ? (
-          <code>{message}</code>
+          <code>{t(`messages:${message}`)}</code>
         ) : (
           <div className="container history">
             <div className="row">
diff --git a/fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx b/fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx
index 57c5e301..a7bb3d50 100644
--- a/fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx
@@ -38,7 +38,7 @@ class ActivityAddEdit extends React.Component {
         </Helmet>
         <br />
         <br />
-        {message && <code>{message}</code>}
+        {message && <code>{t(`messages:${message}`)}</code>}
         <div className="container">
           <div className="row">
             <div className="col-md-2" />
diff --git a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
index bbad22ca..1c06abd9 100644
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
@@ -85,7 +85,7 @@ class ActivityDisplay extends React.Component {
           <title>FitTrackee - {title}</title>
         </Helmet>
         {message ? (
-          <code>{message}</code>
+          <code>{t(`messages:${message}`)}</code>
         ) : (
           <div className="container">
             {displayModal && (
diff --git a/fittrackee_client/src/components/Dashboard/index.jsx b/fittrackee_client/src/components/Dashboard/index.jsx
index 8c42912a..fab1c824 100644
--- a/fittrackee_client/src/components/Dashboard/index.jsx
+++ b/fittrackee_client/src/components/Dashboard/index.jsx
@@ -45,7 +45,7 @@ class DashBoard extends React.Component {
           <title>FitTrackee - {t('common:Dashboard')}</title>
         </Helmet>
         {message ? (
-          <code>{message}</code>
+          <code>{t(`messages:${message}`)}</code>
         ) : (
           activities &&
           sports.length > 0 && (
diff --git a/fittrackee_client/src/components/User/Profile.jsx b/fittrackee_client/src/components/User/Profile.jsx
index 8e7eec0f..a77094dc 100644
--- a/fittrackee_client/src/components/User/Profile.jsx
+++ b/fittrackee_client/src/components/User/Profile.jsx
@@ -20,7 +20,7 @@ function Profile({ message, onDeletePicture, onUploadPicture, t, user }) {
       <Helmet>
         <title>FitTrackee - {t('user:Profile')}</title>
       </Helmet>
-      {message !== '' && <code>{message}</code>}
+      {message !== '' && <code>{t(`messages:${message}`)}</code>}
       <div className="container">
         <h1 className="page-title">{t('user:Profile')}</h1>
         <div className="row">
diff --git a/fittrackee_client/src/components/User/ProfileEdit.jsx b/fittrackee_client/src/components/User/ProfileEdit.jsx
index f160c687..cac79da1 100644
--- a/fittrackee_client/src/components/User/ProfileEdit.jsx
+++ b/fittrackee_client/src/components/User/ProfileEdit.jsx
@@ -58,7 +58,7 @@ class ProfileEdit extends React.Component {
         <Helmet>
           <title>FitTrackee - {t('user:Profile Edition')}</title>
         </Helmet>
-        {message !== '' && <code>{message}</code>}
+        {message !== '' && <code>{t(`messages:${message}`)}</code>}
         {formData.isAuthenticated && (
           <div className="container">
             <h1 className="page-title">{t('user:Profile Edition')}</h1>
diff --git a/fittrackee_client/src/components/User/UserForm.jsx b/fittrackee_client/src/components/User/UserForm.jsx
index 09593fd0..6176c24c 100644
--- a/fittrackee_client/src/components/User/UserForm.jsx
+++ b/fittrackee_client/src/components/User/UserForm.jsx
@@ -5,6 +5,7 @@ import { Redirect } from 'react-router-dom'
 import Form from './Form'
 import { handleUserFormSubmit } from '../../actions/user'
 import { isLoggedIn } from '../../utils'
+import { withTranslation } from 'react-i18next'
 
 class UserForm extends React.Component {
   constructor(props, context) {
@@ -38,7 +39,13 @@ class UserForm extends React.Component {
   }
 
   render() {
-    const { formType, message, messages, onHandleUserFormSubmit } = this.props
+    const {
+      formType,
+      message,
+      messages,
+      onHandleUserFormSubmit,
+      t,
+    } = this.props
     const { formData } = this.state
     return (
       <div>
@@ -46,12 +53,12 @@ class UserForm extends React.Component {
           <Redirect to="/" />
         ) : (
           <div>
-            {message !== '' && <code>{message}</code>}
+            {message !== '' && <code>{t(`messages:${message}`)}</code>}
             {messages.length > 0 && (
               <code>
                 <ul>
                   {messages.map(msg => (
-                    <li key={msg.id}>{msg.value}</li>
+                    <li key={msg.id}>{t(`messages:${msg.value}`)}</li>
                   ))}
                 </ul>
               </code>
@@ -71,15 +78,17 @@ class UserForm extends React.Component {
     )
   }
 }
-export default connect(
-  state => ({
-    location: state.router.location,
-    message: state.message,
-    messages: state.messages,
-  }),
-  dispatch => ({
-    onHandleUserFormSubmit: (formData, formType) => {
-      dispatch(handleUserFormSubmit(formData, formType))
-    },
-  })
-)(UserForm)
+export default withTranslation()(
+  connect(
+    state => ({
+      location: state.router.location,
+      message: state.message,
+      messages: state.messages,
+    }),
+    dispatch => ({
+      onHandleUserFormSubmit: (formData, formType) => {
+        dispatch(handleUserFormSubmit(formData, formType))
+      },
+    })
+  )(UserForm)
+)
diff --git a/fittrackee_client/src/i18n.js b/fittrackee_client/src/i18n.js
index 74c89e24..b3720e86 100644
--- a/fittrackee_client/src/i18n.js
+++ b/fittrackee_client/src/i18n.js
@@ -5,12 +5,14 @@ import XHR from 'i18next-xhr-backend'
 import EnActivitiesTranslations from './locales/en/activities.json'
 import EnCommonTranslations from './locales/en/common.json'
 import EnDashboardTranslations from './locales/en/dashboard.json'
+import EnMessagesTranslations from './locales/en/messages.json'
 import EnSportsTranslations from './locales/en/sports.json'
 import EnStatisticsTranslations from './locales/en/statistics.json'
 import EnUserTranslations from './locales/en/user.json'
 import FrActivitiesTranslations from './locales/fr/activities.json'
 import FrCommonTranslations from './locales/fr/common.json'
 import FrDashboardTranslations from './locales/fr/dashboard.json'
+import FrMessagesTranslations from './locales/fr/messages.json'
 import FrSportsTranslations from './locales/fr/sports.json'
 import FrStatisticsTranslations from './locales/fr/statistics.json'
 import FrUserTranslations from './locales/fr/user.json'
@@ -31,6 +33,7 @@ i18n
         activities: EnActivitiesTranslations,
         common: EnCommonTranslations,
         dashboard: EnDashboardTranslations,
+        messages: EnMessagesTranslations,
         sports: EnSportsTranslations,
         statistics: EnStatisticsTranslations,
         user: EnUserTranslations,
@@ -39,6 +42,7 @@ i18n
         activities: FrActivitiesTranslations,
         common: FrCommonTranslations,
         dashboard: FrDashboardTranslations,
+        messages: FrMessagesTranslations,
         sports: FrSportsTranslations,
         statistics: FrStatisticsTranslations,
         user: FrUserTranslations,
diff --git a/fittrackee_client/src/locales/en/messages.json b/fittrackee_client/src/locales/en/messages.json
new file mode 100644
index 00000000..8105f783
--- /dev/null
+++ b/fittrackee_client/src/locales/en/messages.json
@@ -0,0 +1,26 @@
+{
+  "3 to 12 characters required for username.": "3 to 12 characters required for username.",
+  "8 characters required for password.": "8 characters required for password.",
+  "An error occurred. Please contact the administrator.": "An error occurred. Please contact the administrator.",
+  "Error during picture deletion.": "Error during picture deletion.",
+  "Error during picture update.":  "Error during picture update.",
+  "Error during picture update, file size exceeds max size.": "Error during picture update, file size exceeds max size.",
+  "Error. Registration is disabled.": "Error. Registration is disabled.",
+  "Error. Please try again or contact the administrator.": "Error. Please try again or contact the administrator.",
+  "File extension not allowed.": "File extension not allowed.",
+  "Invalid credentials.": "Invalid credentials.",
+  "Invalid payload.": "Invalid payload.",
+  "Invalid token. Please log in again.": "Invalid token. Please log in again.",
+  "No file part.": "No file part.",
+  "No picture.": "No picture.",
+  "No selected file.": "No selected file.",
+  "no gpx file for this activity": "no gpx file for this activity",
+  "Password and password confirmation don't match.": "Password and password confirmation don't match.",
+  "Provide a valid auth token": "Provide a valid auth token",
+  "Signature expired. Please log in again.": "Signature expired. Please log in again.",
+  "Sorry. That user already exists.": "Sorry. That user already exists.",
+  "Sport does not exist.": "Sport does not exist.",
+  "User does not exist.": "User does not exist.",
+  "Valid email must be provided.\n": "Valid email must be provided.",
+  "You do not have permissions.": "You do not have permissions."
+}
diff --git a/fittrackee_client/src/locales/fr/messages.json b/fittrackee_client/src/locales/fr/messages.json
new file mode 100644
index 00000000..f7549b1d
--- /dev/null
+++ b/fittrackee_client/src/locales/fr/messages.json
@@ -0,0 +1,26 @@
+{
+  "3 to 12 characters required for username.": "3 à 12 caractères requis pour le nom.",
+  "8 characters required for password.": "8 caractères minimum pour le mot de passe.",
+  "An error occurred. Please contact the administrator.": "Une erreur s'est produite. Merci de contacter l'administrateur.",
+  "Error during picture deletion.": "Erreur lors de la suppression de l'image.",
+  "Error during picture update.":  "Erreur lors de la mise à jour de l'image.",
+  "Error during picture update, file size exceeds max size.": "Erreur lors de la mise à jour de l'image, la taille du ficher dépasse la taille maximum autorisée",
+  "Error. Registration is disabled.": "Erreur. L'inscription est désactivée.",
+  "Error. Please try again or contact the administrator.": "Erreur. Veuillez réessayer ou contacter l'administrateur",
+  "File extension not allowed.": "Extension de fichier non autorisée",
+  "Invalid credentials.": "Identifiants invalides.",
+  "Invalid payload.": "Données incorrectes.",
+  "Invalid token. Please log in again.": "Jeton invalide. Merci de vous reconnecter.",
+  "No file part.": "Pas de fichier fourni.",
+  "No picture.": "Pas d'image.",
+  "No selected file.": "Pas de fichier sélectionné.",
+  "no gpx file for this activity": "pas de fichier gpx pour cette activité",
+  "Password and password confirmation don't match.": "Les mots de passe saisis sont différents.",
+  "Provide a valid auth token": "Merci de fournir un jeton valide",
+  "Signature expired. Please log in again.": "Signature expirée. Merci de vous reconnecter.",
+  "Sorry. That user already exists.": "Désolé. Cet utilisateur existe déjà.",
+  "Sport does not exist.": "Le sport n'existe pas.",
+  "User does not exist.": "L'utilisateur n'existe pas.",
+  "Valid email must be provided.\n": "L'email fourni n'est pas valide.",
+  "You do not have permissions.": "Vous n'avez pas les permissions nécessaires."
+}