diff --git a/README.md b/README.md
index d1642b835..3d778b6a6 100644
--- a/README.md
+++ b/README.md
@@ -525,6 +525,8 @@ After modifying any values concerning the localisation, restart the application
  This may happens when the `application.yml` file is missing. 
  To solve this issue copy `config/application.yml.default` to `config/application.yml`.
  This is required before the first start.
+ 
+- Due to a stripe limitation, you won't be ble to create plans longer than one year.
 
 
 <a name="related-documentation"></a>
diff --git a/app/assets/javascripts/controllers/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb
index 7e135ce54..6571e0d7f 100644
--- a/app/assets/javascripts/controllers/admin/members.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/members.coffee.erb
@@ -207,6 +207,10 @@ Application.Controllers.controller "EditMemberController", ["$scope", "$state",
   ## The user to edit
   $scope.user = memberPromise
 
+  ## Should the passord be modified?
+  $scope.password =
+    change: false
+
   ## the user subscription
   if $scope.user.subscribed_plan? and $scope.user.subscription?
     $scope.subscription = $scope.user.subscription
@@ -371,6 +375,10 @@ Application.Controllers.controller "NewMemberController", ["$scope", "$state", "
   ## Form action on the above URL
   $scope.method = 'post'
 
+  ## Should the passord be set manually or generated?
+  $scope.password =
+    change: false
+
   ## Default member's profile parameters
   $scope.user =
     plan_interval: ''
diff --git a/app/assets/javascripts/controllers/members.coffee b/app/assets/javascripts/controllers/members.coffee
index bef2e9bed..8417cc2fd 100644
--- a/app/assets/javascripts/controllers/members.coffee
+++ b/app/assets/javascripts/controllers/members.coffee
@@ -50,6 +50,10 @@ Application.Controllers.controller "EditProfileController", ["$scope", "$rootSco
   ## mapping of fields to disable
   $scope.preventField = {}
 
+  ## Should the passord be modified?
+  $scope.password =
+    change: false
+
   ## Angular-Bootstrap datepicker configuration for birthday
   $scope.datePicker =
     format: $locale.DATETIME_FORMATS.shortDate
diff --git a/app/assets/stylesheets/app.base.scss b/app/assets/stylesheets/app.base.scss
index 4ff669009..168c90161 100644
--- a/app/assets/stylesheets/app.base.scss
+++ b/app/assets/stylesheets/app.base.scss
@@ -31,7 +31,7 @@ h5 {
    &:after {
       position: absolute;
       top: 18px;
-      left: 0px;
+      left: 0;
       content: '';
       width: 35%;
       height: 1px;
@@ -65,7 +65,7 @@ p {
       font-family: $font-proxima-condensed;
       font-size: rem-calc(16);
       line-height: rem-calc(24);
-      margin: 1.038em 0px 30px 0px;
+      margin: 1.038em 0 30px 0;
       font-weight: 600;
    }
 }
@@ -79,7 +79,7 @@ dd {
 }
 
 
-// 
+//
 // -------------------------
 
 .col-0{clear:left;}
@@ -151,7 +151,7 @@ dd {
 
 [ui-view].ng-leave {
   opacity: 1;
-  /*padding-left: 0px;*/  
+  /*padding-left: 0px;*/
   // -webkit-transform:translate3d(0, 0, 0);
   // -moz-transform:translate3d(0, 0, 0);
   // transform:translate3d(0, 0, 0);
diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss
index f4b3b2076..abcf2e9f2 100644
--- a/app/assets/stylesheets/app.components.scss
+++ b/app/assets/stylesheets/app.components.scss
@@ -220,13 +220,13 @@
       .amount {
         padding-top: 16px;
         font-weight: bold;
-        font-size: rem-calc(26);
+        font-size: 1vw;
         color: white;
       }
       .period {
         position: relative;
-        top: -14px;
-        font-size: rem-calc(14);
+        top: -6px;
+        font-size: 0.75vw;
         color: white;
       }
     }
diff --git a/app/assets/stylesheets/app.layout.scss b/app/assets/stylesheets/app.layout.scss
index 3fe0d7907..8228e8902 100644
--- a/app/assets/stylesheets/app.layout.scss
+++ b/app/assets/stylesheets/app.layout.scss
@@ -9,7 +9,7 @@
 	}
 	> .btn,
 	> .btn-group,
-	> .btn-toolbar,
+	> .btn-toolbar
 	{
 		margin-top: 14px;
 	}
diff --git a/app/assets/stylesheets/app.nav.scss b/app/assets/stylesheets/app.nav.scss
index 097b83f52..89a505b0e 100644
--- a/app/assets/stylesheets/app.nav.scss
+++ b/app/assets/stylesheets/app.nav.scss
@@ -169,7 +169,7 @@
 					&:hover,
 					&:focus,
 					&:active,
-					&.active,
+					&.active
 					{
 						> a{
 							i{
@@ -191,7 +191,7 @@
 			}
 			li:hover,
 			li:focus,
-			li:active,
+			li:active
 			{
 				> ul{
 					display: block !important;
@@ -349,7 +349,7 @@
 		display: block !important;
 		position: absolute;
 		left: 0;
-		top: 0px;
+		top: 0;
 		bottom: 0;
 		width: $off-screen-nav-width;
 		visibility: visible;
@@ -384,7 +384,7 @@
 			overflow: hidden;
 			position: absolute;
 			width: 100%;
-			top: 0px;
+			top: 0;
 			bottom: 0;
 			left: 0;
 			right: 0;
diff --git a/app/assets/templates/admin/pricing/index.html.erb b/app/assets/templates/admin/pricing/index.html.erb
index 4a5ce4acf..9f771348f 100644
--- a/app/assets/templates/admin/pricing/index.html.erb
+++ b/app/assets/templates/admin/pricing/index.html.erb
@@ -47,7 +47,7 @@
                   <tr ng-repeat="plan in plans | orderBy:orderPlans">
                       <td>{{getPlanType(plan.type)}}</td>
                       <td>{{plan.base_name}}</td>
-                      <td>{{ plan.interval | planIntervalFilter }}</td>
+                      <td>{{ plan.interval | planIntervalFilter:plan.interval_count }}</td>
                       <td>{{getGroupFromId(groups, plan.group_id).name}}</td>
                       <td>{{plan.ui_weight}}</td>
                       <td>{{plan.amount | currency}}</td>
diff --git a/app/assets/templates/profile/complete.html.erb b/app/assets/templates/profile/complete.html.erb
index 17ed28d1d..91d4c4bed 100644
--- a/app/assets/templates/profile/complete.html.erb
+++ b/app/assets/templates/profile/complete.html.erb
@@ -74,7 +74,7 @@
                                     <input type="checkbox"
                                            name="user[is_allow_contact]"
                                            ng-model="user.is_allow_contact"
-                                           value="true"/> {{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' }}
+                                           value="true"/> {{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' | translate }}
                                 </div>
 
                                 <!-- accept cgu -->
diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb
index ba7b55c16..1a4e3f6cc 100644
--- a/app/assets/templates/shared/_member_form.html.erb
+++ b/app/assets/templates/shared/_member_form.html.erb
@@ -5,7 +5,7 @@
 
 <div class="row m-t">
     <div class="col-sm-3 col-sm-offset-1">
-      <div class="form-group m-t-lg"> 
+      <div class="form-group m-t-lg">
           <div class="fileinput text-center" data-provides="fileinput" ng-class="fileinputClass(user.profile.user_avatar.attachment_url)">
             <div class="fileinput-new thumbnail rounded thumb-128-wrapper" style="width: 140px; height: 140px;">
               <img src="<%= image_path("no_avatar.png") %>" class="img-circle">
@@ -123,11 +123,12 @@
 
       <div class="form-group" ng-hide="preventPassword">
         <button class="btn btn-warning btn-block"
-                ng-click="change_password = !change_password; $event.stopPropagation(); $event.preventDefault()" translate>{{ 'change_password' }}</button>
+                ng-click="password.change = !password.change; $event.stopPropagation(); $event.preventDefault()"
+                translate>{{ 'change_password' }}</button>
       </div>
-      
 
-      <div class="form-group" ng-class="{'has-error': userForm['user[password]'].$dirty && userForm['user[password]'].$invalid}" ng-if="change_password">
+
+      <div class="form-group" ng-class="{'has-error': userForm['user[password]'].$dirty && userForm['user[password]'].$invalid}" ng-if="password.change">
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-key"></i> </span>
           <input type="password"
@@ -143,7 +144,7 @@
         <span class="help-block" ng-show="userForm['user[password]'].$dirty && userForm['user[password]'].$error.minlength" translate>{{ 'password_is_too_short_(minimum_8_characters)' }}</span>
       </div>
 
-      <div class="form-group" ng-class="{'has-error': userForm['user[password_confirmation]'].$dirty && userForm['user[password_confirmation]'].$invalid}" ng-if="change_password">
+      <div class="form-group" ng-class="{'has-error': userForm['user[password_confirmation]'].$dirty && userForm['user[password_confirmation]'].$invalid}" ng-if="password.change">
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-key"></i> </span>
           <input type="password"
diff --git a/app/controllers/api/plans_controller.rb b/app/controllers/api/plans_controller.rb
index ffc9b5c8e..b9b922112 100644
--- a/app/controllers/api/plans_controller.rb
+++ b/app/controllers/api/plans_controller.rb
@@ -18,44 +18,48 @@
 
   def create
     authorize Plan
-    if plan_params[:type] and plan_params[:type] == 'PartnerPlan'
+    begin
+      if plan_params[:type] and plan_params[:type] == 'PartnerPlan'
 
-      partner = User.find(params[:plan][:partner_id])
+        partner = User.find(params[:plan][:partner_id])
 
-      if plan_params[:group_id] == 'all'
-        plans = PartnerPlan.create_for_all_groups(plan_params)
-        if plans
-          plans.each { |plan| partner.add_role :partner, plan }
-          render json: { plan_ids: plans.map(&:id) }, status: :created
-        else
-          render status: :unprocessable_entity
-        end
+        if plan_params[:group_id] == 'all'
+          plans = PartnerPlan.create_for_all_groups(plan_params)
+          if plans
+            plans.each { |plan| partner.add_role :partner, plan }
+            render json: { plan_ids: plans.map(&:id) }, status: :created
+          else
+            render status: :unprocessable_entity
+          end
 
-      else
-        @plan = PartnerPlan.new(plan_params)
-        if @plan.save
-          partner.add_role :partner, @plan
-          render :show, status: :created
         else
-          render json: @plan.errors, status: :unprocessable_entity
-        end
-      end
-    else
-      if plan_params[:group_id] == 'all'
-        plans = Plan.create_for_all_groups(plan_params)
-        if plans
-          render json: { plan_ids: plans.map(&:id) }, status: :created
-        else
-          render status: :unprocessable_entity
+          @plan = PartnerPlan.new(plan_params)
+          if @plan.save
+            partner.add_role :partner, @plan
+            render :show, status: :created
+          else
+            render json: @plan.errors, status: :unprocessable_entity
+          end
         end
       else
-        @plan = Plan.new(plan_params)
-        if @plan.save
-          render :show, status: :created, location: @plan
+        if plan_params[:group_id] == 'all'
+          plans = Plan.create_for_all_groups(plan_params)
+          if plans
+            render json: { plan_ids: plans.map(&:id) }, status: :created
+          else
+            render status: :unprocessable_entity
+          end
         else
-          render json: @plan.errors, status: :unprocessable_entity
+          @plan = Plan.new(plan_params)
+          if @plan.save
+            render :show, status: :created, location: @plan
+          else
+            render json: @plan.errors, status: :unprocessable_entity
+          end
         end
       end
+    rescue Stripe::InvalidRequestError => e
+      render json: {error: e.message}, status: :unprocessable_entity
     end
   end