diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 6ad51eef5..f0199dcff 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -47,19 +47,19 @@
                     </p>
 
 
-                    <div class="col-md-11 col-md-offset-1" style="border-top: 0px;">
+                    <div class="col-md-12" style="border-top: 0px;">
 
 
                         <!-- slack endpoint -->
                         <div class="form-group {{ $errors->has('slack_endpoint') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                 {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
                             </div>
-                            <div class="col-md-8">
+                            <div class="col-md-10">
                                 @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
+                                    {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
                                 @else
-                                    {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
+                                    {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
                                 @endif
                                 {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -67,10 +67,10 @@
 
                         <!-- slack channel -->
                         <div class="form-group {{ $errors->has('slack_channel') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                 {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
                             </div>
-                            <div class="col-md-8">
+                            <div class="col-md-10">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('slack_channel', Request::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
                                 @else
@@ -82,10 +82,10 @@
 
                         <!-- slack botname -->
                         <div class="form-group {{ $errors->has('slack_botname') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                 {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
                             </div>
-                            <div class="col-md-8">
+                            <div class="col-md-10">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('slack_botname', Request::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
                                 @else
@@ -97,20 +97,18 @@
 
                         @if (($setting->slack_channel!='') && ($setting->slack_endpoint))
                         <div class="form-group">
-                            <div class="col-md-3">
-                                {{ Form::label('est_slack', 'Test Slack') }}
+                            <div class="col-md-2">
+                                {{ Form::label('test_slack', 'Test Slack') }}
                             </div>
-                            <div class="col-md-8" id="slacktestrow">
+                            <div class="col-md-10" id="slacktestrow">
                                 <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test <i class="fa fa-slack"></i> Integration</a>
                             </div>
-                            <div class="col-md-8 col-md-offset-3">
+                            <div class="col-md-10 col-md-offset-2">
                                 <span id="slacktesticon"></span>
                                 <span id="slacktestresult"></span>
                                 <span id="slackteststatus"></span>
                             </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                <p class="help-block">{{ trans('admin/settings/general.slack_test_help') }}</p>
-                            </div>
+
 
                         </div>
                          @endif
@@ -121,7 +119,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" id="save_slack" class="btn btn-primary" disabled><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -133,9 +131,15 @@
 
 @stop
 
-@section('moar_scripts')
+@push('js')
     <script nonce="{{ csrf_token() }}">
         $("#slacktest").click(function() {
+
+            $("slack_channel").click(function(){
+                $("input:text").val("Glenn Quagmire");
+            });
+
+
             $("#slacktestrow").removeClass('text-success');
             $("#slacktestrow").removeClass('text-danger');
             $("#slackteststatus").removeClass('text-danger');
@@ -149,21 +153,25 @@
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
                 },
                 data: {
-                    'ldaptest_user': $('#ldaptest_user').val(),
-                    'ldaptest_password': $('#ldaptest_password').val()
+                    'slack_endpoint': $('#slack_endpoint').val(),
+                    'slack_channel': $('#slack_channel').val(),
+                    'slack_botname': $('#slack_botname').val(),
+
                 },
 
                 dataType: 'json',
 
                 success: function (data) {
+                    $('#save_slack').removeAttr('disabled');
                     $("#slacktesticon").html('');
                     $("#slacktestrow").addClass('text-success');
                     $("#slackteststatus").addClass('text-success');
-                    $("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the {{ $setting->slack_channel}} channel for your test message');
+                    $("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the ' + $('#slack_channel').val() + ' channel for your test message, and be sure to click SAVE below to store your settings.');
                 },
 
                 error: function (data) {
 
+
                     if (data.responseJSON) {
                         var errors = data.responseJSON.message;
                     } else {
@@ -172,6 +180,7 @@
 
                     var error_text = '';
 
+                    $('#save_slack').attr("disabled", true);
                     $("#slacktesticon").html('');
                     $("#slackteststatus").addClass('text-danger');
                     $("#slacktesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
@@ -206,4 +215,4 @@
 
     </script>
 
-@stop
+@endpush